diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-07-12 17:14:37 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-07-12 17:14:37 -0700 |
| commit | 72376da8ba85cefadd552d3213318f789a38d6ed (patch) | |
| tree | 6c625398b43b82faccea2fbb131619652b31a677 /test/cpp/qps | |
| parent | 9e3691c5bd6819abe45465cd220ff923d5e6f598 (diff) | |
Get json_run_localhost working again
Diffstat (limited to 'test/cpp/qps')
| -rwxr-xr-x | test/cpp/qps/gen_build_yaml.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/cpp/qps/gen_build_yaml.py b/test/cpp/qps/gen_build_yaml.py index 255968256e..e26d4323b3 100755 --- a/test/cpp/qps/gen_build_yaml.py +++ b/test/cpp/qps/gen_build_yaml.py @@ -47,7 +47,8 @@ def _scenario_json_string(scenario_json): # tweak parameters to get fast test times scenario_json['warmup_seconds'] = 1 scenario_json['benchmark_seconds'] = 10 - return json.dumps(scenario_config.remove_nonproto_fields(scenario_json)) + scenarios_json = {'scenarios': [scenario_config.remove_nonproto_fields(scenario_json)]} + return json.dumps(scenarios_json) def threads_of_type(scenario_json, path): d = scenario_json @@ -72,7 +73,7 @@ print yaml.dump({ { 'name': 'json_run_localhost', 'shortname': 'json_run_localhost:%s' % scenario_json['name'], - 'args': ['--scenario_json', + 'args': ['--scenarios_json', pipes.quote(_scenario_json_string(scenario_json))], 'ci_platforms': ['linux', 'mac', 'posix', 'windows'], 'platforms': ['linux', 'mac', 'posix', 'windows'], |