diff options
author | 2015-08-12 12:03:07 -0700 | |
---|---|---|
committer | 2015-08-12 12:03:07 -0700 | |
commit | 2cd4e87ff5afeb6fb92762bb3c16f2534212e498 (patch) | |
tree | e129a1d15b6c21af8aee75268c94a201c88ba918 /tools/run_tests/run_interops.py | |
parent | d8cbcf9613aeb6089b15e9b46a2e9374bcb8aa03 (diff) | |
parent | 826f07eb6f8dc2366375b7c96cc12bca1302518c (diff) |
Merge github.com:grpc/grpc into selective-town
Conflicts:
tools/run_tests/run_interops.py
Diffstat (limited to 'tools/run_tests/run_interops.py')
-rwxr-xr-x | tools/run_tests/run_interops.py | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/tools/run_tests/run_interops.py b/tools/run_tests/run_interops.py index c2b9c7a70e..e1d40d32c1 100755 --- a/tools/run_tests/run_interops.py +++ b/tools/run_tests/run_interops.py @@ -4,27 +4,23 @@ import jobset argp = argparse.ArgumentParser(description='Run interop tests.') argp.add_argument('-l', '--language', - choices=['build_only', 'c++'], - nargs='+', - default=['build_only']) + default='c++') args = argp.parse_args() # build job -build_steps = 'tools/run_tests/run_interops_build.sh' -build_job = jobset.JobSpec(cmdline=build_steps, shortname='build') +build_job = jobset.JobSpec(cmdline=['tools/run_tests/run_interops_build.sh', '%s' % args.language], shortname='build') -# test jobs +# test jobs, each test is a separate job to run in parallel _TESTS = ['large_unary', 'empty_unary', 'ping_pong', 'client_streaming', 'server_streaming'] jobs = [] jobNumber = 0 -for lang in args.language: - for test in _TESTS: - test_job = jobset.JobSpec( - cmdline=['tools/run_tests/run_interops_test.sh', '%s' % lang, '%s' % test], +for test in _TESTS: + test_job = jobset.JobSpec( + cmdline=['tools/run_tests/run_interops_test.sh', '%s' % args.language, '%s' % test], shortname=test, timeout_seconds=15*60) - jobs.append(test_job) - jobNumber+=1 + jobs.append(test_job) + jobNumber+=1 root = ET.Element('testsuites') testsuite = ET.SubElement(root, 'testsuite', id='1', package='grpc', name='tests') |