diff options
| author |  murgatroid99 <mlumish@google.com> | 2017-03-07 18:04:52 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2017-03-09 10:04:58 -0800 |
| commit | d0cda5c40b08c9b4db394fc253b830be59c3b7b9 (patch) | |
| tree | 74ba1689d8e210390ee6c1a26ed3a43fd4064fa7 /tools | |
| parent | 2280306ec38e2c0df7cc8f2535af14dfab7b9ebc (diff) | |
Add uv resolver fallback for named ports, fix portability tests
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/run_tests/generated/tests.json | 4 | ||||
| -rwxr-xr-x | tools/run_tests/run_tests_matrix.py | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index 46c8338401..2af5ec8df1 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -1790,7 +1790,9 @@ ], "cpu_cost": 1.0, "exclude_configs": [], - "exclude_iomgrs": [], + "exclude_iomgrs": [ + "uv" + ], "flaky": false, "gtest": false, "language": "c", diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py index 5f5df70d1d..cfc7f2b6fd 100755 --- a/tools/run_tests/run_tests_matrix.py +++ b/tools/run_tests/run_tests_matrix.py @@ -92,19 +92,19 @@ def _generate_jobs(languages, configs, platforms, iomgr_platform = 'native', for config in configs: name = '%s_%s_%s_%s' % (language, platform, config, iomgr_platform) runtests_args = ['-l', language, - '-c', config] + '-c', config, + '--iomgr_platform', iomgr_platform] if arch or compiler: name += '_%s_%s' % (arch, compiler) runtests_args += ['--arch', arch, '--compiler', compiler] - runtests_args += extra_args if platform == 'linux': job = _docker_jobspec(name=name, runtests_args=runtests_args, inner_jobs=inner_jobs) else: job = _workspace_jobspec(name=name, runtests_args=runtests_args, inner_jobs=inner_jobs) - job.labels = [platform, config, language] + labels + job.labels = [platform, config, language, iomgr_platform] + labels result.append(job) return result |