diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-02-18 09:58:05 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-02-18 09:58:05 -0800 |
| commit | 7d243df88f359263f4c1ca82a472e49199bd52fe (patch) | |
| tree | 94a847d7697e75e5415b84ca57e2fd968f35d8fd /tools/run_tests/run_node.sh | |
| parent | c15cd723ebabbab4825480032b56a2ddd9a8b76b (diff) | |
Increase Node's per-test timeout and Ruby's overall test timeout
Diffstat (limited to 'tools/run_tests/run_node.sh')
| -rwxr-xr-x | tools/run_tests/run_node.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/run_tests/run_node.sh b/tools/run_tests/run_node.sh index 40f61d77cc..178584ae8e 100755 --- a/tools/run_tests/run_node.sh +++ b/tools/run_tests/run_node.sh @@ -41,10 +41,13 @@ cd $(dirname $0)/../.. root=`pwd` +test_directory='src/node/test' +timeout=8000 + if [ "$CONFIG" = "gcov" ] then ./node_modules/.bin/istanbul cover --dir reports/node_coverage \ - -x **/interop/* ./node_modules/.bin/_mocha -- --timeout 8000 src/node/test + -x **/interop/* ./node_modules/.bin/_mocha -- --timeout $timeout $test_directory cd build gcov Release/obj.target/grpc/ext/*.o lcov --base-directory . --directory . -c -o coverage.info @@ -55,5 +58,7 @@ then echo '<html><head><meta http-equiv="refresh" content="0;URL=lcov-report/index.html"></head></html>' > \ ../reports/node_coverage/index.html else - JUNIT_REPORT_PATH=src/node/reports.xml JUNIT_REPORT_STACK=1 ./node_modules/.bin/mocha --reporter mocha-jenkins-reporter src/node/test + JUNIT_REPORT_PATH=src/node/reports.xml JUNIT_REPORT_STACK=1 \ + ./node_modules/.bin/mocha --timeout $timeout \ + --reporter mocha-jenkins-reporter $test_directory fi |