diff options
author | Mark D. Roth <roth@google.com> | 2016-12-08 14:27:56 -0800 |
---|---|---|
committer | Mark D. Roth <roth@google.com> | 2016-12-08 14:27:56 -0800 |
commit | 3c1cd531870c9bd047cf9cf507c9abdf69882634 (patch) | |
tree | e6472585ab09cb4f14dcde2aaddcaf4b2b79d54e /tools/run_tests/run_performance_tests.py | |
parent | 3059828bf6129d6ecb6ce705347fc43e0affa209 (diff) | |
parent | ad13e597e5664391589d3100efbe8337fad557b2 (diff) |
Merge remote-tracking branch 'upstream/master' into handshaker_early_exit
Diffstat (limited to 'tools/run_tests/run_performance_tests.py')
-rwxr-xr-x | tools/run_tests/run_performance_tests.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/run_tests/run_performance_tests.py b/tools/run_tests/run_performance_tests.py index 1d0c98fb69..0109099ccc 100755 --- a/tools/run_tests/run_performance_tests.py +++ b/tools/run_tests/run_performance_tests.py @@ -464,9 +464,10 @@ for scenario in scenarios: try: for worker in scenario.workers: worker.start() - scenario_failures, resultset = jobset.run([scenario.jobspec, - create_quit_jobspec(scenario.workers, remote_host=args.remote_driver_host)], - newline_on_success=True, maxjobs=1) + jobs = [scenario.jobspec] + if scenario.workers: + jobs.append(create_quit_jobspec(scenario.workers, remote_host=args.remote_driver_host)) + scenario_failures, resultset = jobset.run(jobs, newline_on_success=True, maxjobs=1) total_scenario_failures += scenario_failures merged_resultset = dict(itertools.chain(merged_resultset.iteritems(), resultset.iteritems())) |