diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-02-24 15:40:07 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-02-24 15:40:07 -0800 |
| commit | 0544d7fd662b1f8426653f386f93bd54174dcacc (patch) | |
| tree | 25e98122945cfe20b2fc6070db447e7a21b54e98 /tools | |
| parent | d14d1033879bbb3e8e757dfb39d78fba6d93e144 (diff) | |
| parent | c68dc7031be1f0ec12445cd17e58f21a6080cde8 (diff) | |
Merge github.com:grpc/grpc into 44
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/jenkins/docker_run_tests.sh | 2 | ||||
| -rw-r--r-- | tools/run_tests/run_node.bat | 2 | ||||
| -rwxr-xr-x | tools/run_tests/run_node.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/jenkins/docker_run_tests.sh b/tools/jenkins/docker_run_tests.sh index 1b93b1d492..8d6c42cd9b 100755 --- a/tools/jenkins/docker_run_tests.sh +++ b/tools/jenkins/docker_run_tests.sh @@ -62,6 +62,6 @@ echo '</body></html>' >> index.html cd .. zip -r reports.zip reports -find . -name reports.xml | xargs zip reports.zip +find . -name report.xml | xargs zip reports.zip exit $exit_code diff --git a/tools/run_tests/run_node.bat b/tools/run_tests/run_node.bat index ad9ca14b8b..4177736356 100644 --- a/tools/run_tests/run_node.bat +++ b/tools/run_tests/run_node.bat @@ -27,6 +27,6 @@ @rem (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE @rem OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -set JUNIT_REPORT_PATH=src\node\reports.xml +set JUNIT_REPORT_PATH=src\node\report.xml set JUNIT_REPORT_STACK=1 .\node_modules\.bin\mocha.cmd --reporter mocha-jenkins-reporter --timeout 8000 src\node\test
\ No newline at end of file diff --git a/tools/run_tests/run_node.sh b/tools/run_tests/run_node.sh index 178584ae8e..d33890068d 100755 --- a/tools/run_tests/run_node.sh +++ b/tools/run_tests/run_node.sh @@ -58,7 +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 \ + JUNIT_REPORT_PATH=src/node/report.xml JUNIT_REPORT_STACK=1 \ ./node_modules/.bin/mocha --timeout $timeout \ --reporter mocha-jenkins-reporter $test_directory fi |