diff options
Diffstat (limited to 'tools/run_tests/run_tests_matrix.py')
| -rwxr-xr-x | tools/run_tests/run_tests_matrix.py | 86 |
1 files changed, 49 insertions, 37 deletions
diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py index 1c99e794a9..e43319beba 100755 --- a/tools/run_tests/run_tests_matrix.py +++ b/tools/run_tests/run_tests_matrix.py @@ -114,7 +114,7 @@ def _workspace_jobspec(name, def _generate_jobs(languages, configs, platforms, - iomgr_platform='native', + iomgr_platforms=['native'], arch=None, compiler=None, labels=[], @@ -125,40 +125,43 @@ def _generate_jobs(languages, result = [] for language in languages: for platform in platforms: - for config in configs: - name = '%s_%s_%s_%s' % (language, platform, config, - iomgr_platform) - runtests_args = [ - '-l', language, '-c', config, '--iomgr_platform', - iomgr_platform - ] - if arch or compiler: - name += '_%s_%s' % (arch, compiler) - runtests_args += ['--arch', arch, '--compiler', compiler] - if '--build_only' in extra_args: - name += '_buildonly' - for extra_env in extra_envs: - name += '_%s_%s' % (extra_env, extra_envs[extra_env]) - - runtests_args += extra_args - if platform == 'linux': - job = _docker_jobspec( - name=name, - runtests_args=runtests_args, - runtests_envs=extra_envs, - inner_jobs=inner_jobs, - timeout_seconds=timeout_seconds) - else: - job = _workspace_jobspec( - name=name, - runtests_args=runtests_args, - runtests_envs=extra_envs, - inner_jobs=inner_jobs, - timeout_seconds=timeout_seconds) - - job.labels = [platform, config, language, iomgr_platform - ] + labels - result.append(job) + for iomgr_platform in iomgr_platforms: + for config in configs: + name = '%s_%s_%s_%s' % (language, platform, config, + iomgr_platform) + runtests_args = [ + '-l', language, '-c', config, '--iomgr_platform', + iomgr_platform + ] + if arch or compiler: + name += '_%s_%s' % (arch, compiler) + runtests_args += [ + '--arch', arch, '--compiler', compiler + ] + if '--build_only' in extra_args: + name += '_buildonly' + for extra_env in extra_envs: + name += '_%s_%s' % (extra_env, extra_envs[extra_env]) + + runtests_args += extra_args + if platform == 'linux': + job = _docker_jobspec( + name=name, + runtests_args=runtests_args, + runtests_envs=extra_envs, + inner_jobs=inner_jobs, + timeout_seconds=timeout_seconds) + else: + job = _workspace_jobspec( + name=name, + runtests_args=runtests_args, + runtests_envs=extra_envs, + inner_jobs=inner_jobs, + timeout_seconds=timeout_seconds) + + job.labels = [platform, config, language, iomgr_platform + ] + labels + result.append(job) return result @@ -184,13 +187,22 @@ def _create_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS): timeout_seconds=_CPP_RUNTESTS_TIMEOUT) test_jobs += _generate_jobs( - languages=['csharp', 'python'], + languages=['csharp'], configs=['dbg', 'opt'], platforms=['linux', 'macos', 'windows'], labels=['basictests', 'multilang'], extra_args=extra_args, inner_jobs=inner_jobs) + test_jobs += _generate_jobs( + languages=['python'], + configs=['opt'], + platforms=['linux', 'macos', 'windows'], + iomgr_platforms=['native', 'gevent'], + labels=['basictests', 'multilang'], + extra_args=extra_args, + inner_jobs=inner_jobs) + # supported on linux and mac. test_jobs += _generate_jobs( languages=['c++'], @@ -377,7 +389,7 @@ def _create_portability_test_jobs(extra_args=[], languages=['c'], configs=['dbg'], platforms=['linux'], - iomgr_platform='uv', + iomgr_platforms=['uv'], labels=['portability', 'corelang'], extra_args=extra_args, inner_jobs=inner_jobs, |