aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests/run_tests_matrix.py
diff options
context:
space:
mode:
authorGravatar Yuchen Zeng <zyc@google.com>2016-11-08 10:50:12 -0800
committerGravatar Yuchen Zeng <zyc@google.com>2016-11-08 10:50:12 -0800
commit87b5910345fba4b63be3314d59ed631832a8ed29 (patch)
tree77330128d04b7126de905363fd9f4ec3b95405b7 /tools/run_tests/run_tests_matrix.py
parentfdae4bdea50d64a0ccde08ff39e1f3b20c5d89a9 (diff)
Remove C++ native resolver test on windows
Diffstat (limited to 'tools/run_tests/run_tests_matrix.py')
-rwxr-xr-xtools/run_tests/run_tests_matrix.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py
index 260e0eee61..154b4f1ba5 100755
--- a/tools/run_tests/run_tests_matrix.py
+++ b/tools/run_tests/run_tests_matrix.py
@@ -100,7 +100,7 @@ def _generate_jobs(languages, configs, platforms,
runtests_args += ['--arch', arch,
'--compiler', compiler]
for extra_env in extra_envs:
- name += '_%s=%s' % (extra_env, extra_envs[extra_env])
+ name += '_%s_%s' % (extra_env, extra_envs[extra_env])
runtests_args += extra_args
if platform == 'linux':
@@ -220,11 +220,16 @@ def _create_portability_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS)
extra_args=extra_args,
inner_jobs=inner_jobs)
- # Test c and C++ with the native DNS resolver
+ # C and C++ with the native DNS resolver on Linux
test_jobs += _generate_jobs(languages=['c', 'c++'],
- configs=['dbg'], platforms=['linux', 'windows'],
- arch='default',
- compiler='default',
+ configs=['dbg'], platforms=['linux'],
+ labels=['portability'],
+ extra_args=extra_args,
+ extra_envs={'GRPC_DNS_RESOLVER': 'native'})
+
+ # C with the native DNS resolver on Windonws
+ test_jobs += _generate_jobs(languages=['c'],
+ configs=['dbg'], platforms=['windows'],
labels=['portability'],
extra_args=extra_args,
extra_envs={'GRPC_DNS_RESOLVER': 'native'})