diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rwxr-xr-x | gen_docs.sh | 5 | ||||
| -rwxr-xr-x | test-coverage.sh | 7 | ||||
| -rwxr-xr-x | test-perf.sh | 8 | ||||
| -rwxr-xr-x | test-scenario.sh | 6 | ||||
| -rwxr-xr-x | test.sh | 9 |
6 files changed, 12 insertions, 25 deletions
@@ -2,6 +2,8 @@ build/ angularjs.netrc jstd.log .DS_Store +gen_docs.disable +test.disable regression/temp*.html performance/temp*.html .idea/workspace.xml diff --git a/gen_docs.sh b/gen_docs.sh index 8ac17d70..9d7afb67 100755 --- a/gen_docs.sh +++ b/gen_docs.sh @@ -1,3 +1,4 @@ #!/bin/bash -. ~/.bashrc -node docs/spec/specs.js --noColor | grep -v '/lib/jasmine' && node docs/src/gen-docs.js +if [ ! -e gen_docs.disable ]; then + /usr/bin/env node docs/spec/specs.js --noColor | grep -v '/lib/jasmine' && node docs/src/gen-docs.js +fi diff --git a/test-coverage.sh b/test-coverage.sh index df678faf..5616f138 100755 --- a/test-coverage.sh +++ b/test-coverage.sh @@ -1,9 +1,4 @@ #!/bin/sh -tests=$1 -if [[ $tests = "" ]]; then - tests="all" -fi - -java -Xmx1g -jar lib/jstestdriver/JsTestDriver.jar --config jsTestDriver-coverage.conf --testOutput=tmp/lcov --tests "$tests" +java -Xmx1g -jar lib/jstestdriver/JsTestDriver.jar --config jsTestDriver-coverage.conf --testOutput=tmp/lcov --tests all $@ genhtml -o tmp/coverage-html/ tmp/lcov/jsTestDriver.conf-coverage.dat echo "done! check out tmp/coverage-html/index.html" diff --git a/test-perf.sh b/test-perf.sh index 8dfb97a3..21ef066d 100755 --- a/test-perf.sh +++ b/test-perf.sh @@ -1,13 +1,9 @@ #!/bin/sh -tests=$1 -norecompile=$2 -if [[ $tests = "" ]]; then - tests="all" -fi +norecompile=$1 if [[ $norecompile = "" ]]; then rake compile fi -java -jar lib/jstestdriver/JsTestDriver.jar --tests "$tests" --config jsTestDriver-perf.conf +java -jar lib/jstestdriver/JsTestDriver.jar --tests all --config jsTestDriver-perf.conf $@ diff --git a/test-scenario.sh b/test-scenario.sh index 8ecf8b03..e2c89c19 100755 --- a/test-scenario.sh +++ b/test-scenario.sh @@ -1,7 +1,3 @@ #!/bin/bash -tests=$1 -if [[ $tests = "" ]]; then - tests="all" -fi -java -jar lib/jstestdriver/JsTestDriver.jar --tests "$tests" --config jsTestDriver-scenario.conf --reset +java -jar lib/jstestdriver/JsTestDriver.jar --tests "all" --config jsTestDriver-scenario.conf --reset @@ -1,8 +1,5 @@ #!/bin/bash -tests=$1 -if [[ $tests = "" ]]; then - tests="all" +if [ ! -e test.dissable ]; then + java -jar lib/jstestdriver/JsTestDriver.jar --tests all $@ + #java -jar lib/jstestdriver/JsTestDriver.jar --tests all --config jsTestDriver-jquery.conf $@ fi - -java -jar lib/jstestdriver/JsTestDriver.jar --tests "$tests" -#java -jar lib/jstestdriver/JsTestDriver.jar --tests "$tests" --config jsTestDriver-jquery.conf |