Resolved merge conflicts with master
diff --git a/tools/run_tests/run_node.sh b/tools/run_tests/run_node.sh
index eb68b20..7809690 100755
--- a/tools/run_tests/run_node.sh
+++ b/tools/run_tests/run_node.sh
@@ -39,13 +39,13 @@
if [ "$CONFIG" = "gcov" ]
then
- ./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- \
- --timeout 8000 src/node/test
+ ./node_modules/.bin/istanbul cover --dir reports/node_coverage \
+ ./node_modules/.bin/_mocha -- --timeout 8000 src/node/test
cd build
gcov Release/obj.target/grpc/ext/*.o
lcov --base-directory . --directory . -c -o coverage.info
- genhtml -o ../ext_coverage --num-spaces 2 -t 'Node gRPC test coverage' \
- coverage.info
+ genhtml -o ../reports/node_ext_coverage --num-spaces 2 \
+ -t 'Node gRPC test coverage' coverage.info
else
./node_modules/mocha/bin/mocha --timeout 8000 src/node/test
fi