Merge branch 'node_run_tests_py' into node_surface_cancellation

pull/221/head
murgatroid99 10 years ago
commit 6cf933c4d2
  1. 3
      src/node/test/interop_sanity_test.js
  2. 7
      tools/run_tests/build_node.sh
  3. 8
      tools/run_tests/build_php.sh
  4. 10
      tools/run_tests/run_node.sh
  5. 18
      tools/run_tests/run_tests.py

@ -48,6 +48,9 @@ describe('Interop tests', function() {
port = 'localhost:' + server_obj.port;
done();
});
after(function() {
server.shutdown();
});
// This depends on not using a binary stream
it('should pass empty_unary', function(done) {
interop_client.runTest(port, name_override, 'empty_unary', true, done);

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

@ -2,14 +2,13 @@
set -ex
CONFIG=${CONFIG:-opt}
# change to grpc repo root
cd $(dirname $0)/../..
root=`pwd`
export GRPC_LIB_SUBDIR=libs/opt
# make the libraries
make -j static_c
export GRPC_LIB_SUBDIR=libs/$CONFIG
# build php
cd src/php
@ -18,4 +17,3 @@ cd ext/grpc
phpize
./configure --enable-grpc=$root
make

@ -0,0 +1,10 @@
#!/bin/bash
set -ex
# change to grpc repo root
cd $(dirname $0)/../..
root=`pwd`
$root/src/node/node_modules/mocha/bin/mocha $root/src/node/test

@ -59,6 +59,19 @@ class CLanguage(object):
def build_steps(self):
return []
class NodeLanguage(object):
def __init__(self):
self.allow_hashing = False
def test_binaries(self, config):
return ['tools/run_tests/run_node.sh']
def make_targets(self):
return ['static_c']
def build_steps(self):
return [['tools/run_tests/build_node.sh']]
class PhpLanguage(object):
@ -69,7 +82,7 @@ class PhpLanguage(object):
return ['src/php/bin/run_tests.sh']
def make_targets(self):
return []
return ['static_c']
def build_steps(self):
return [['tools/run_tests/build_php.sh']]
@ -107,6 +120,7 @@ _DEFAULT = ['dbg', 'opt']
_LANGUAGES = {
'c++': CLanguage('cxx', 'c++'),
'c': CLanguage('c', 'c'),
'node': NodeLanguage(),
'php': PhpLanguage(),
'python': PythonLanguage(),
}
@ -191,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