diff --git a/tools/internal_ci/macos/grpc_basictests_objc.cfg b/tools/internal_ci/macos/grpc_basictests_objc.cfg index 6563fa69d02..c5ee5015c3c 100644 --- a/tools/internal_ci/macos/grpc_basictests_objc.cfg +++ b/tools/internal_ci/macos/grpc_basictests_objc.cfg @@ -27,10 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests macos objc dbg --internal_ci -j 1 --inner_jobs 4 --bq_result_table aggregate_results" -} - -env_vars { - key: "GRPC_OBJC_TEST_EXTRA_ARGS" - value: "-r ios-test-.*" + value: "-f basictests macos objc dbg --internal_ci -j 1 --inner_jobs 4 --bq_result_table aggregate_results --extra_args '-r ios-test-.*'" } diff --git a/tools/internal_ci/macos/grpc_buildtests_objc.cfg b/tools/internal_ci/macos/grpc_buildtests_objc.cfg index d1a802eef5e..d4bbcf5ab47 100644 --- a/tools/internal_ci/macos/grpc_buildtests_objc.cfg +++ b/tools/internal_ci/macos/grpc_buildtests_objc.cfg @@ -27,10 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests macos objc dbg --internal_ci -j 1 --inner_jobs 4 --bq_result_table aggregate_results" -} - -env_vars { - key: "GRPC_OBJC_TEST_EXTRA_ARGS" - value: "-r ios-buildtest-.*" + value: "-f basictests macos objc dbg --internal_ci -j 1 --inner_jobs 4 --bq_result_table aggregate_results --extra_args '-r ios-buildtest-.*'" } diff --git a/tools/internal_ci/macos/grpc_mactests_objc.cfg b/tools/internal_ci/macos/grpc_mactests_objc.cfg index 945bcb8c466..2147e12eb85 100644 --- a/tools/internal_ci/macos/grpc_mactests_objc.cfg +++ b/tools/internal_ci/macos/grpc_mactests_objc.cfg @@ -27,10 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests macos objc dbg --internal_ci -j 1 --inner_jobs 4 --bq_result_table aggregate_results" -} - -env_vars { - key: "GRPC_OBJC_TEST_EXTRA_ARGS" - value: "-r mac-test-.*" + value: "-f basictests macos objc dbg --internal_ci -j 1 --inner_jobs 4 --bq_result_table aggregate_results --extra_args '-r mac-test-.*'" } diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py index ac9acbce730..ffb7e2cc71d 100755 --- a/tools/run_tests/run_tests_matrix.py +++ b/tools/run_tests/run_tests_matrix.py @@ -249,7 +249,7 @@ def _create_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS): configs=['dbg'], platforms=['macos'], labels=['basictests', 'multilang'], - extra_args=extra_args + [os.getenv('GRPC_OBJC_TEST_EXTRA_ARGS', '.*')], + extra_args=extra_args, inner_jobs=inner_jobs, timeout_seconds=_OBJC_RUNTESTS_TIMEOUT) @@ -519,6 +519,11 @@ if __name__ == "__main__": type=str, nargs='?', help='Upload test results to a specified BQ table.') + argp.add_argument( + '--extra_args', + default='', + type=str, + help='Extra test args passed to each sub-script.') args = argp.parse_args() extra_args = [] @@ -536,6 +541,8 @@ if __name__ == "__main__": extra_args.append('--bq_result_table') extra_args.append('%s' % args.bq_result_table) extra_args.append('--measure_cpu_costs') + if args.extra_args: + extra_args.append('%s' % args.extra_args) all_jobs = _create_test_jobs(extra_args=extra_args, inner_jobs=args.inner_jobs) + \ _create_portability_test_jobs(extra_args=extra_args, inner_jobs=args.inner_jobs)