diff options
| author |  Michael Lumish <mlumish@google.com> | 2017-05-31 10:52:08 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-05-31 10:52:08 -0700 |
| commit | 5cae37ab5e0232bb48c0427168ccd6c9d069f6e0 (patch) | |
| tree | eb833d481cc0437b303eb31528999cd549ae512c /tools/run_tests | |
| parent | 90423b72f769640f85431bcc31f84620422c770d (diff) | |
| parent | 4bea5b9866412c181c16cac119c314910a701c20 (diff) | |
Merge pull request #11342 from murgatroid99/node_8_tests
Run tests on Node 8 by default, add Node 7 to portability suite
Diffstat (limited to 'tools/run_tests')
| -rwxr-xr-x | tools/run_tests/run_tests.py | 7 | ||||
| -rwxr-xr-x | tools/run_tests/run_tests_matrix.py | 9 |
2 files changed, 13 insertions, 3 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 568774cece..266d31bf89 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -431,10 +431,11 @@ class NodeLanguage(object): # we should specify in the compiler argument _check_compiler(self.args.compiler, ['default', 'node0.12', 'node4', 'node5', 'node6', - 'node7', 'electron1.3', 'electron1.6']) + 'node7', 'node8', + 'electron1.3', 'electron1.6']) if self.args.compiler == 'default': self.runtime = 'node' - self.node_version = '7' + self.node_version = '8' else: if self.args.compiler.startswith('electron'): self.runtime = 'electron' @@ -1173,7 +1174,7 @@ argp.add_argument('--compiler', 'clang3.4', 'clang3.5', 'clang3.6', 'clang3.7', 'vs2013', 'vs2015', 'python2.7', 'python3.4', 'python3.5', 'python3.6', 'pypy', 'pypy3', 'python_alpine', - 'node0.12', 'node4', 'node5', 'node6', 'node7', + 'node0.12', 'node4', 'node5', 'node6', 'node7', 'node8', 'electron1.3', 'electron1.6', 'coreclr', 'cmake'], diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py index 84551d9394..32b9d5676d 100755 --- a/tools/run_tests/run_tests_matrix.py +++ b/tools/run_tests/run_tests_matrix.py @@ -309,6 +309,15 @@ def _create_portability_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS) extra_args=extra_args, inner_jobs=inner_jobs) + test_jobs += _generate_jobs(languages=['node'], + configs=['dbg'], + platforms=['linux'], + arch='default', + compiler='node7', + labels=['portability'], + extra_args=extra_args, + inner_jobs=inner_jobs) + return test_jobs |