Index: scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_metric_android_fyi_perf_bisect.json |
diff --git a/scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_metric_android_fyi_perf_bisect.json b/scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_metric_android_fyi_perf_bisect.json |
index 4d8305da96c473c9c3456ba5aa71ff2903662685..24692e01b1294ad03a0e1e558773648d72674391 100644 |
--- a/scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_metric_android_fyi_perf_bisect.json |
+++ b/scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_metric_android_fyi_perf_bisect.json |
@@ -436,7 +436,7 @@ |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
"@@@STEP_LOG_LINE@json.output@ \"client_operation_id\": \"12345726327327\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"command\": \"./tools/perf/run_benchmark -v --browser=android-chrome sunspider\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"command\": \"./tools/perf/run_benchmark -v --browser=android-chrome --output-format=chartjson sunspider\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"max_time_minutes\": \"25\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"metric\": \"dummy/dummy\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"repeat_count\": \"1\", @@@", |
@@ -662,10 +662,12 @@ |
"[BUILDER_CACHE]/android_fyi_perf_bisect/src/tools/perf/run_benchmark", |
"-v", |
"--browser=android-chrome", |
+ "--output-format=chartjson", |
"sunspider", |
"--reset-results", |
"--upload-results", |
- "--results-label=Patch" |
+ "--results-label=Patch", |
+ "--output-dir=[TMP_BASE]/perf-test-output_tmp_1" |
], |
"cwd": "[BUILDER_CACHE]/android_fyi_perf_bisect", |
"env": { |
@@ -689,6 +691,21 @@ |
"cmd": [ |
"python", |
"-u", |
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
+ "[TMP_BASE]/perf-test-output_tmp_1/results-chart.json", |
+ "/path/to/tmp/json" |
+ ], |
+ "cwd": "[BUILDER_CACHE]/android_fyi_perf_bisect", |
+ "name": "Reading chartjson results", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@json.output (invalid)@null@@@", |
+ "@@@STEP_LOG_END@json.output (invalid)@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", |
"--master", |
"tryserver.chromium.perf", |
@@ -1018,9 +1035,11 @@ |
"[BUILDER_CACHE]/android_fyi_perf_bisect/src/tools/perf/run_benchmark", |
"-v", |
"--browser=android-chrome", |
+ "--output-format=chartjson", |
"sunspider", |
"--upload-results", |
- "--results-label=TOT" |
+ "--results-label=TOT", |
+ "--output-dir=[TMP_BASE]/perf-test-output_tmp_2" |
], |
"cwd": "[BUILDER_CACHE]/android_fyi_perf_bisect", |
"env": { |
@@ -1041,21 +1060,44 @@ |
] |
}, |
{ |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
+ "[TMP_BASE]/perf-test-output_tmp_2/results-chart.json", |
+ "/path/to/tmp/json" |
+ ], |
+ "cwd": "[BUILDER_CACHE]/android_fyi_perf_bisect", |
+ "name": "Reading chartjson results (2)", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@json.output (invalid)@null@@@", |
+ "@@@STEP_LOG_END@json.output (invalid)@@@" |
+ ] |
+ }, |
+ { |
"cmd": [], |
"cwd": "[BUILDER_CACHE]/android_fyi_perf_bisect", |
"name": "Results", |
"~followup_annotations": [ |
- "@@@STEP_TEXT@", |
- "===== PERF TRY JOB RESULTS =====", |
+ "@@@STEP_TEXT@No values from test with patch, or none from test without patch.", |
+ "Output with patch:", |
+ "*RESULT dummy: dummy= [5.83,6.013,5.573]ms", |
+ "Avg dummy: 5.907711ms", |
+ "Sd dummy: 0.255921ms", |
+ "RESULT telemetry_page_measurement_results: num_failed= 0 count", |
+ "RESULT telemetry_page_measurement_results: num_errored= 0 count", |
+ "", |
+ "View online at http://storage.googleapis.com/chromium-telemetry/html-results/results-with_patch", |
+ "", |
"", |
- "Test Command: src/tools/perf/run_benchmark -v --browser=android-chrome sunspider", |
- "Test Metric: dummy/dummy", |
- "Relative Change: 0.00000%", |
- "Standard Error: +- 0.18047 delta", |
+ "Output without patch:", |
+ "*RESULT dummy: dummy= [5.83,6.013,5.573]ms", |
+ "Avg dummy: 5.907711ms", |
+ "Sd dummy: 0.255921ms", |
+ "RESULT telemetry_page_measurement_results: num_failed= 0 count", |
+ "RESULT telemetry_page_measurement_results: num_errored= 0 count", |
"", |
- "Revision Mean Std.Error", |
- "Patch 5.805333333330.127614436662", |
- "No Patch 5.805333333330.127614436662", |
+ "View online at http://storage.googleapis.com/chromium-telemetry/html-results/results-without_patch", |
"@@@", |
"@@@STEP_LINK@HTML Results@http://storage.googleapis.com/chromium-telemetry/html-results/results-without_patch@@@" |
] |
@@ -1068,7 +1110,7 @@ |
], |
"cwd": "[BUILDER_CACHE]/android_fyi_perf_bisect", |
"name": "Post bisect results", |
- "stdin": "{\"data\": {\"bisect_bot\": \"android_fyi_perf_bisect\", \"buildbot_log_url\": \"http://c.org/p/cr/builders/android_fyi_perf_bisect/builds/571\", \"change\": 0.0, \"cloud_link\": \"http://storage.googleapis.com/chromium-telemetry/html-results/results-without_patch\", \"command\": \"src/tools/perf/run_benchmark -v --browser=android-chrome sunspider\", \"metric\": \"dummy/dummy\", \"profiler_links\": [], \"result\": \"Revision Mean Std.Error\\nPatch 5.805333333330.127614436662\\nNo Patch 5.805333333330.127614436662\", \"status\": \"completed\", \"std_err\": 0.1804740670813644, \"try_job_id\": null}, \"url\": \"https://chromeperf.appspot.com/post_bisect_results\"}", |
+ "stdin": "{\"data\": {\"bisect_bot\": \"android_fyi_perf_bisect\", \"buildbot_log_url\": \"http://c.org/p/cr/builders/android_fyi_perf_bisect/builds/571\", \"cloud_link\": \"http://storage.googleapis.com/chromium-telemetry/html-results/results-without_patch\", \"command\": \"src/tools/perf/run_benchmark -v --browser=android-chrome --output-format=chartjson sunspider\", \"metric\": \"dummy/dummy\", \"status\": \"completed\", \"try_job_id\": null, \"warnings\": [\"No values from test with patch, or none from test without patch.\\n Output with patch:\\n*RESULT dummy: dummy= [5.83,6.013,5.573]ms\\nAvg dummy: 5.907711ms\\nSd dummy: 0.255921ms\\nRESULT telemetry_page_measurement_results: num_failed= 0 count\\nRESULT telemetry_page_measurement_results: num_errored= 0 count\\n\\nView online at http://storage.googleapis.com/chromium-telemetry/html-results/results-with_patch\\n\\n\\nOutput without patch:\\n*RESULT dummy: dummy= [5.83,6.013,5.573]ms\\nAvg dummy: 5.907711ms\\nSd dummy: 0.255921ms\\nRESULT telemetry_page_measurement_results: num_failed= 0 count\\nRESULT telemetry_page_measurement_results: num_errored= 0 count\\n\\nView online at http://storage.googleapis.com/chromium-telemetry/html-results/results-without_patch\\n\"]}, \"url\": \"https://chromeperf.appspot.com/post_bisect_results\"}", |
"stdout": "/path/to/tmp/json", |
"~followup_annotations": [ |
"@@@STEP_TEXT@Failed to upload result to Perf Dashboard. Error response: None@@@", |