Skip to content

Commit

Permalink
Allow disabling of shell scripts without changing eclipse configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
mhevery committed Jun 8, 2011
1 parent a23d15a commit 4295b3d
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 25 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions gen_docs.sh
Original file line number Diff line number Diff line change
@@ -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
7 changes: 1 addition & 6 deletions test-coverage.sh
Original file line number Diff line number Diff line change
@@ -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"
8 changes: 2 additions & 6 deletions test-perf.sh
Original file line number Diff line number Diff line change
@@ -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 $@
6 changes: 1 addition & 5 deletions test-scenario.sh
Original file line number Diff line number Diff line change
@@ -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
9 changes: 3 additions & 6 deletions test.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 4295b3d

Please sign in to comment.