Move extra args into RUN_TESTS_FLAGS

pull/19177/head
Muxi Yan 6 years ago
parent a517c375fe
commit 7b239a287e
  1. 7
      tools/internal_ci/macos/grpc_basictests_objc.cfg
  2. 7
      tools/internal_ci/macos/grpc_buildtests_objc.cfg
  3. 7
      tools/internal_ci/macos/grpc_mactests_objc.cfg
  4. 9
      tools/run_tests/run_tests_matrix.py

@ -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-.*'"
}

@ -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-.*'"
}

@ -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-.*'"
}

@ -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)

Loading…
Cancel
Save