diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-05-03 16:33:54 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-05-03 16:33:54 -0700 |
| commit | 1231c2a6b23fcf1669d6c34abd2026a4c6193ea8 (patch) | |
| tree | 213f6147e4aee766cdd165bc3f8098d5eaed8e15 /tools/run_tests/run_tests.py | |
| parent | c027e77d6408c7ae9b1889f64e2629fa66872f3d (diff) | |
| parent | 442bead4a38cecb7f523e17a03df011028f1e925 (diff) | |
Merge github.com:grpc/grpc into error
Diffstat (limited to 'tools/run_tests/run_tests.py')
| -rwxr-xr-x | tools/run_tests/run_tests.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index dea481ef90..d50d5aac95 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -272,12 +272,17 @@ class NodeLanguage(object): def __init__(self): self.platform = platform_string() - self.node_version = '0.12' def configure(self, config, args): self.config = config self.args = args - _check_compiler(self.args.compiler, ['default']) + _check_compiler(self.args.compiler, ['default', 'node0.12', + 'node4', 'node5']) + if self.args.compiler == 'default': + self.node_version = '4' + else: + # Take off the word "node" + self.node_version = self.args.compiler[4:] def test_specs(self): if self.platform == 'windows': @@ -802,7 +807,8 @@ argp.add_argument('--compiler', 'gcc4.4', 'gcc4.9', 'gcc5.3', 'clang3.4', 'clang3.6', 'vs2010', 'vs2013', 'vs2015', - 'python2.7', 'python3.4'], + 'python2.7', 'python3.4', + 'node0.12', 'node4', 'node5'], default='default', help='Selects compiler to use. Allowed values depend on the platform and language.') argp.add_argument('--build_only', |