aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@users.noreply.github.com>2016-01-27 13:04:43 -0800
committerGravatar Jan Tattermusch <jtattermusch@users.noreply.github.com>2016-01-27 13:04:43 -0800
commit1b3b1ee05aba5eedf4ffe5b341aa3a0257e5bbf7 (patch)
tree8c0ed755a9d2aee2c2ac8407fc51ca93d9a42334 /tools
parent06300f7b5dd03cf3fbb4d89032e204691bd0a628 (diff)
parente30785affbabb534f11ef493e69e38fc35e7e7dd (diff)
Merge pull request #4873 from murgatroid99/node_test_running_fix
Stop Node tests from incorrectly reporting success
Diffstat (limited to 'tools')
-rwxr-xr-xtools/run_tests/run_node.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/run_tests/run_node.sh b/tools/run_tests/run_node.sh
index fff579fab8..f93c9c30cb 100755
--- a/tools/run_tests/run_node.sh
+++ b/tools/run_tests/run_node.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2015, Google Inc.
+# Copyright 2015-2016, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -51,5 +51,5 @@ 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 || true
+ JUNIT_REPORT_PATH=src/node/reports.xml JUNIT_REPORT_STACK=1 ./node_modules/.bin/mocha --reporter mocha-jenkins-reporter src/node/test
fi