From 004128ce85da0fb051710f5141d11daf35868050 Mon Sep 17 00:00:00 2001
From: murgatroid99 <mlumish@google.com>
Date: Thu, 1 Oct 2015 11:54:21 -0700
Subject: [PATCH] Updated run_tests with new node package location
---
tools/run_tests/build_node.sh | 5 -----
tools/run_tests/run_node.sh | 8 ++------
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/tools/run_tests/build_node.sh b/tools/run_tests/build_node.sh
index 95ffb94c6e..faa7b624b8 100755
--- a/tools/run_tests/build_node.sh
+++ b/tools/run_tests/build_node.sh
@@ -36,9 +36,4 @@ CONFIG=${CONFIG:-opt}
# change to grpc repo root
cd $(dirname $0)/../..
-export CXXFLAGS=-I`pwd`/include
-export LDFLAGS=-L`pwd`/libs/$CONFIG
-
-cd src/node
-
npm install --unsafe-perm
diff --git a/tools/run_tests/run_node.sh b/tools/run_tests/run_node.sh
index 1043b447db..eb68b20e83 100755
--- a/tools/run_tests/run_node.sh
+++ b/tools/run_tests/run_node.sh
@@ -37,19 +37,15 @@ cd $(dirname $0)/../..
root=`pwd`
-cd $root/src/node
-
-export LD_LIBRARY_PATH=$root/libs/$CONFIG
-
if [ "$CONFIG" = "gcov" ]
then
./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- \
- --timeout 8000
+ --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
else
- ./node_modules/mocha/bin/mocha --timeout 8000
+ ./node_modules/mocha/bin/mocha --timeout 8000 src/node/test
fi
--
GitLab