From cd04e493d096fa96be3d168e2c884e172b496ef5 Mon Sep 17 00:00:00 2001 From: Christoffer Jansson Date: Tue, 9 Feb 2016 16:14:14 +0100 Subject: [PATCH 1/3] rename run-test>start-tests.sh to make it clearer --- package.json | 4 ++-- src/testrunner/start-tests.sh | 21 +++++++++++++++++++++ test/start-tests.sh | 21 +++++++++++++++++++++ 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 src/testrunner/start-tests.sh create mode 100755 test/start-tests.sh diff --git a/package.json b/package.json index 7294b40..1b355dd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "webrtc-utilities", - "version": "0.0.2", + "version": "0.0.4", "author": "The WebRTC project authors (https://www.webrtc.org/)", "description": "WebRTC test framework utilities.", "license": "BSD-3-Clause", @@ -18,7 +18,7 @@ }, "scripts": { "prepublish": "grunt githooks", - "test": "grunt && test/run-tests" + "test": "grunt && ./test/start-tests.sh" }, "devDependencies": { "grunt": "^0.4.5", diff --git a/src/testrunner/start-tests.sh b/src/testrunner/start-tests.sh new file mode 100644 index 0000000..8b5d51e --- /dev/null +++ b/src/testrunner/start-tests.sh @@ -0,0 +1,21 @@ +# +# Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. +# +# Use of this source code is governed by a BSD-style license +# that can be found in the LICENSE file in the root of the source +# tree. +#!/bin/sh + +# Run with a default set of parameters +BINDIR=./browsers/bin +export BROWSER=${BROWSER-chrome} +export BVER=${BVER-stable} +BROWSERBIN=$BINDIR/$BROWSER-$BVER +if [ ! -x $BROWSERBIN ]; then + echo "Installing browser" + ./node_modules/travis-multirunner/setup.sh +fi +echo "Starting browser" +PATH=$PATH:./node_modules/.bin + +node test/run-tests.js diff --git a/test/start-tests.sh b/test/start-tests.sh new file mode 100755 index 0000000..8b5d51e --- /dev/null +++ b/test/start-tests.sh @@ -0,0 +1,21 @@ +# +# Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. +# +# Use of this source code is governed by a BSD-style license +# that can be found in the LICENSE file in the root of the source +# tree. +#!/bin/sh + +# Run with a default set of parameters +BINDIR=./browsers/bin +export BROWSER=${BROWSER-chrome} +export BVER=${BVER-stable} +BROWSERBIN=$BINDIR/$BROWSER-$BVER +if [ ! -x $BROWSERBIN ]; then + echo "Installing browser" + ./node_modules/travis-multirunner/setup.sh +fi +echo "Starting browser" +PATH=$PATH:./node_modules/.bin + +node test/run-tests.js From 3cf72bf52ab1d74ec3eb366179865bdd2aa42826 Mon Sep 17 00:00:00 2001 From: Christoffer Jansson Date: Tue, 9 Feb 2016 16:24:17 +0100 Subject: [PATCH 2/3] fix permissions --- src/testrunner/start-tests.sh | 0 test/run-tests | 21 --------------------- 2 files changed, 21 deletions(-) mode change 100644 => 100755 src/testrunner/start-tests.sh delete mode 100755 test/run-tests diff --git a/src/testrunner/start-tests.sh b/src/testrunner/start-tests.sh old mode 100644 new mode 100755 diff --git a/test/run-tests b/test/run-tests deleted file mode 100755 index acf5ec2..0000000 --- a/test/run-tests +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. -# -# Use of this source code is governed by a BSD-style license -# that can be found in the LICENSE file in the root of the source -# tree. -#!/bin/sh - -# Run testling with a default set of parameters -BINDIR=./browsers/bin -export BROWSER=${BROWSER-chrome} -export BVER=${BVER-stable} -BROWSERBIN=$BINDIR/$BROWSER-$BVER -if [ ! -x $BROWSERBIN ]; then - echo "Installing browser" - ./node_modules/travis-multirunner/setup.sh -fi -echo "Starting browser" -PATH=$PATH:./node_modules/.bin - -node test/run-tests.js From 3076c45b280914ffb596082838629f54b49fb521 Mon Sep 17 00:00:00 2001 From: Christoffer Jansson Date: Tue, 9 Feb 2016 16:29:46 +0100 Subject: [PATCH 3/3] bump version again ;) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1b355dd..64c9f2b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "webrtc-utilities", - "version": "0.0.4", + "version": "0.0.5", "author": "The WebRTC project authors (https://www.webrtc.org/)", "description": "WebRTC test framework utilities.", "license": "BSD-3-Clause",