Got run_tests.py and node tests working

pull/213/head
murgatroid99 10 years ago
parent 564b944b3c
commit c279165f72
  1. 7
      tools/run_tests/build_node.sh
  2. 2
      tools/run_tests/run_node.sh
  3. 4
      tools/run_tests/run_tests.py

@ -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

@ -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

@ -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

Loading…
Cancel
Save