diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2017-06-26 17:13:14 +0200 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2017-08-23 07:53:18 +0200 |
| commit | add32254eb21a12b49c4674c3e83c570b7947756 (patch) | |
| tree | 302fe932b7105ff4e99852bfefb368fb19f0936a | |
| parent | 6521c5078c9d4c817cc61665a68a471c877571ea (diff) | |
adjust run tests matrix
| -rwxr-xr-x | tools/run_tests/run_tests_matrix.py | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py index 04e2a70d28..7d26b284da 100755 --- a/tools/run_tests/run_tests_matrix.py +++ b/tools/run_tests/run_tests_matrix.py @@ -211,15 +211,25 @@ def _create_portability_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS) # portability C on Windows for arch in ['x86', 'x64']: - for compiler in ['vs2013', 'vs2015']: - test_jobs += _generate_jobs(languages=['c'], - configs=['dbg'], - platforms=['windows'], - arch=arch, - compiler=compiler, - labels=['portability', 'corelang'], - extra_args=extra_args, - inner_jobs=inner_jobs) + test_jobs += _generate_jobs(languages=['c'], + configs=['dbg'], + platforms=['windows'], + arch=arch, + compiler='default', + labels=['portability', 'corelang'], + extra_args=extra_args, + inner_jobs=inner_jobs) + + # portability C++ on Windows + # TODO(jtattermusch): some of the tests are failing, so we force --build_only + test_jobs += _generate_jobs(languages=['c++'], + configs=['dbg'], + platforms=['windows'], + arch='default', + compiler='default', + labels=['portability', 'corelang'], + extra_args=extra_args + ['--build_only'], + inner_jobs=inner_jobs) # C and C++ with the c-ares DNS resolver on Linux test_jobs += _generate_jobs(languages=['c', 'c++'], @@ -236,12 +246,12 @@ def _create_portability_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS) # extra_args=extra_args, # extra_envs={'GRPC_DNS_RESOLVER': 'ares'}) - # cmake build for C and C++ + # C and C++ build with cmake on Linux # TODO(jtattermusch): some of the tests are failing, so we force --build_only # to make sure it's buildable at least. test_jobs += _generate_jobs(languages=['c', 'c++'], configs=['dbg'], - platforms=['linux', 'windows'], + platforms=['linux'], arch='default', compiler='cmake', labels=['portability', 'corelang'], |