From c279165f726dedc976fa9a73f1afe700639c6f3e Mon Sep 17 00:00:00 2001
From: murgatroid99 <michael.lumish@gmail.com>
Date: Mon, 26 Jan 2015 11:33:39 -0800
Subject: [PATCH] Got run_tests.py and node tests working
---
tools/run_tests/build_node.sh | 7 +++----
tools/run_tests/run_node.sh | 2 +-
tools/run_tests/run_tests.py | 4 ++--
3 files changed, 6 insertions(+), 7 deletions(-)
mode change 100644 => 100755 tools/run_tests/run_node.sh
diff --git a/tools/run_tests/build_node.sh b/tools/run_tests/build_node.sh
index 600b1bde8c..4b092982b2 100755
--- a/tools/run_tests/build_node.sh
+++ b/tools/run_tests/build_node.sh
@@ -2,19 +2,18 @@
set -ex
+CONFIG=${CONFIG:-opt}
+
# change to grpc repo root
cd $(dirname $0)/../..
# tells npm install to look for files in that directory
export GRPC_ROOT=`pwd`
# tells npm install the subdirectory with library files
-export GRPC_LIB_SUBDIR=libs/opt
+export GRPC_LIB_SUBDIR=libs/$CONFIG
# tells npm install not to use default locations
export GRPC_NO_INSTALL=yes
-# build the c libraries
-make -j static_c
-
cd src/node
npm install
diff --git a/tools/run_tests/run_node.sh b/tools/run_tests/run_node.sh
old mode 100644
new mode 100755
index 76f8a1a4f4..0056295949
--- a/tools/run_tests/run_node.sh
+++ b/tools/run_tests/run_node.sh
@@ -7,4 +7,4 @@ cd $(dirname $0)/../..
root=`pwd`
-$root/src/node/node_modules/mocha/bin/mocha $root/node/test
+$root/src/node/node_modules/mocha/bin/mocha $root/src/node/test
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index bfe6d7949b..4f2f10f15c 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -68,7 +68,7 @@ class NodeLanguage(object):
return ['tools/run_tests/run_node.sh']
def make_targets(self):
- return []
+ return ['static_c']
def build_steps(self):
return [['tools/run_tests/build_node.sh']]
@@ -205,7 +205,7 @@ class TestCache(object):
def _build_and_run(check_cancelled, newline_on_success, cache):
"""Do one pass of building & running tests."""
# build latest, sharing cpu between the various makes
- if not jobset.run(build_steps):
+ if not jobset.run(build_steps, maxjobs=1):
return 1
# run all the tests
--
GitLab