From 1014a4ef98f3e821ef34b1e5baab145995f9d28b Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Fri, 1 Apr 2016 14:11:55 -0700 Subject: [PATCH] Flatten Node coverage reports by one level to avoid issues with redirects --- third_party/boringssl | 2 +- tools/run_tests/run_node.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/third_party/boringssl b/third_party/boringssl index 907ae62b9d8..9f897b25800 160000 --- a/third_party/boringssl +++ b/third_party/boringssl @@ -1 +1 @@ -Subproject commit 907ae62b9d81121cb86b604f83e6b811a43f7a87 +Subproject commit 9f897b25800d2f54f5c442ef01a60721aeca6d87 diff --git a/tools/run_tests/run_node.sh b/tools/run_tests/run_node.sh index b94dc3ec628..f00bd1a5af6 100755 --- a/tools/run_tests/run_node.sh +++ b/tools/run_tests/run_node.sh @@ -48,6 +48,7 @@ if [ "$CONFIG" = "gcov" ] then ./node_modules/.bin/istanbul cover --dir reports/node_coverage \ -x **/interop/* ./node_modules/.bin/_mocha -- --timeout $timeout $test_directory + cp -r reports/node_coverage/lcov-report/* reports/node_coverage/ cd build gcov Release/obj.target/grpc/ext/*.o lcov --base-directory . --directory . -c -o coverage.info @@ -55,8 +56,6 @@ then genhtml -o ../reports/node_ext_coverage --num-spaces 2 \ -t 'Node gRPC test coverage' coverage.info --rc genhtml_hi_limit=95 \ --rc genhtml_med_limit=80 --no-prefix - echo '' > \ - ../reports/node_coverage/index.html else JUNIT_REPORT_PATH=src/node/report.xml JUNIT_REPORT_STACK=1 \ ./node_modules/.bin/mocha --timeout $timeout \