Skip to content
Browse files

Update scripts for running tests

- change forward slash into back slash in Win scripts
- split params to new lines
- remove $tests option as it makes no sense now
  • Loading branch information...
1 parent e8c28eb commit 07951a6a80223a61a8f73746cc5d68aa2422fdfb @vojtajina vojtajina committed
Showing with 19 additions and 17 deletions.
  1. +3 −3 scripts/test-server.bat
  2. +8 −4 scripts/test-server.sh
  3. +3 −3 scripts/test.bat
  4. +5 −7 scripts/test.sh
View
6 scripts/test-server.bat
@@ -12,8 +12,8 @@ echo Starting JsTestDriver Server (http://code.google.com/p/js-test-driver/)
echo Please open the following url and capture one or more browsers:
echo http://localhost:%PORT%/
-java -jar "%BASE_DIR%/../test/lib/jstestdriver/JsTestDriver.jar" ^
+java -jar "%BASE_DIR%\..\test\lib\jstestdriver\JsTestDriver.jar" ^
--port %PORT% ^
--browserTimeout 20000 ^
- --config "%BASE_DIR%/../config/jsTestDriver.conf" ^
- --basePath "%BASE_DIR%/.."
+ --config "%BASE_DIR%\..\config\jsTestDriver.conf" ^
+ --basePath "%BASE_DIR%\.."
View
12 scripts/test-server.sh
@@ -1,10 +1,14 @@
#!/bin/bash
-base_dir=`dirname $0`
-port=9876
+BASE_DIR=`dirname $0`
+PORT=9876
echo "Starting JsTestDriver Server (http://code.google.com/p/js-test-driver/)"
echo "Please open the following url and capture one or more browsers:"
-echo "http://localhost:$port"
+echo "http://localhost:$PORT"
-java -jar "$base_dir/../test/lib/jstestdriver/JsTestDriver.jar" --port $port --browserTimeout 20000 --config "$base_dir/../config/jsTestDriver.conf" --basePath "$base_dir/.."
+java -jar "$BASE_DIR/../test/lib/jstestdriver/JsTestDriver.jar" \
+ --port $PORT \
+ --browserTimeout 20000 \
+ --config "$BASE_DIR/../config/jsTestDriver.conf" \
+ --basePath "$BASE_DIR/.."
View
6 scripts/test.bat
@@ -8,7 +8,7 @@ REM - Java (http://www.java.com)
set BASE_DIR=%~dp0
-java -jar "%BASE_DIR%/../test/lib/jstestdriver/JsTestDriver.jar" ^
- --config "%BASE_DIR%/../config/jsTestDriver.conf" ^
- --basePath "%BASE_DIR%/.." ^
+java -jar "%BASE_DIR%\..\test\lib\jstestdriver\JsTestDriver.jar" ^
+ --config "%BASE_DIR%\..\config\jsTestDriver.conf" ^
+ --basePath "%BASE_DIR%\.." ^
--tests all
View
12 scripts/test.sh
@@ -1,10 +1,8 @@
#!/bin/bash
-base_dir=`dirname $0`
+BASE_DIR=`dirname $0`
-tests=$1
-if [[ $tests = "" ]]; then
- tests="all"
-fi
-
-java -jar "$base_dir/../test/lib/jstestdriver/JsTestDriver.jar" --config "$base_dir/../config/jsTestDriver.conf" --basePath "$base_dir/.." --tests "$tests"
+java -jar "$BASE_DIR/../test/lib/jstestdriver/JsTestDriver.jar" \
+ --config "$BASE_DIR/../config/jsTestDriver.conf" \
+ --basePath "$BASE_DIR/.." \
+ --tests all

0 comments on commit 07951a6

Please sign in to comment.
Something went wrong with that request. Please try again.