| Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win_optional_gpu_tests_rel.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win_optional_gpu_tests_rel.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win_optional_gpu_tests_rel.json
|
| index 45e3b9eb091a8777570869107bd33d3f2c49c8eb..73e541647dbc273dae2aff395d53bf1040f6df59 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win_optional_gpu_tests_rel.json
|
| +++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win_optional_gpu_tests_rel.json
|
| @@ -229,30 +229,34 @@
|
| "@@@STEP_LOG_LINE@analyze_details@ \"compile_targets\": [@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"angle_deqp_gles2_tests_run\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"angle_end2end_tests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"chrome\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"chromium_builder_tests\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"crash_service\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"mini_installer\", @@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_new_test_run\"@@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_test_run\"@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.compile_targets\": [@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"angle_deqp_gles2_tests_run\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"angle_end2end_tests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"chrome\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"chromium_builder_tests\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"crash_service\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"mini_installer\", @@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_new_test_run\"@@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_test_run\"@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.test_targets\": [@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"angle_deqp_gles2_tests_run\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"angle_end2end_tests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"chrome\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"mini_installer\", @@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_new_test_run\"@@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_test_run\"@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"test_targets\": [@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"angle_deqp_gles2_tests_run\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"angle_end2end_tests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"chrome\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"mini_installer\", @@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_new_test_run\"@@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_test_run\"@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ ]@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@}@@@",
|
| "@@@STEP_LOG_END@analyze_details@@@"
|
| @@ -302,10 +306,11 @@
|
| "--",
|
| "angle_deqp_gles2_tests_run",
|
| "angle_end2end_tests_run",
|
| + "chrome",
|
| "chromium_builder_tests",
|
| "crash_service",
|
| "mini_installer",
|
| - "telemetry_gpu_new_test_run"
|
| + "telemetry_gpu_test_run"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "compile (with patch)",
|
| @@ -339,7 +344,7 @@
|
| "--isolate-server",
|
| "https://isolateserver.appspot.com",
|
| "--verbose",
|
| - "[SLAVE_BUILD]\\src\\out\\Release\\telemetry_gpu_new_test.isolated.gen.json",
|
| + "[SLAVE_BUILD]\\src\\out\\Release\\telemetry_gpu_test.isolated.gen.json",
|
| "[SLAVE_BUILD]\\src\\out\\Release\\angle_deqp_gles2_tests.isolated.gen.json",
|
| "[SLAVE_BUILD]\\src\\out\\Release\\angle_end2end_tests.isolated.gen.json"
|
| ],
|
| @@ -349,7 +354,7 @@
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"angle_deqp_gles2_tests\": \"[dummy hash for angle_deqp_gles2_tests]\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"angle_end2end_tests\": \"[dummy hash for angle_end2end_tests]\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"telemetry_gpu_new_test\": \"[dummy hash for telemetry_gpu_new_test]\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"telemetry_gpu_test\": \"[dummy hash for telemetry_gpu_test]\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -440,7 +445,7 @@
|
| "--tag",
|
| "buildnumber:571",
|
| "--tag",
|
| - "data:[dummy hash for telemetry_gpu_new_test]",
|
| + "data:[dummy hash for telemetry_gpu_test]",
|
| "--tag",
|
| "gpu_test:1",
|
| "--tag",
|
| @@ -463,7 +468,7 @@
|
| "stepname:webgl2_conformance on NVIDIA GPU on Windows (with patch) on Windows",
|
| "--user",
|
| "commit-bot@chromium.org",
|
| - "[dummy hash for telemetry_gpu_new_test]",
|
| + "[dummy hash for telemetry_gpu_test]",
|
| "--",
|
| "webgl_conformance",
|
| "--show-stdout",
|
| @@ -472,7 +477,10 @@
|
| "--webgl-conformance-version=2.0.0",
|
| "--webgl2-only=true",
|
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
|
| - "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
|
| + "--output-format",
|
| + "json",
|
| + "--output-dir",
|
| + "${ISOLATED_OUTDIR}"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] webgl2_conformance on NVIDIA GPU on Windows (with patch) on Windows",
|
| @@ -532,7 +540,7 @@
|
| "--tag",
|
| "buildnumber:571",
|
| "--tag",
|
| - "data:[dummy hash for telemetry_gpu_new_test]",
|
| + "data:[dummy hash for telemetry_gpu_test]",
|
| "--tag",
|
| "gpu_test:1",
|
| "--tag",
|
| @@ -555,14 +563,17 @@
|
| "stepname:webgl_conformance_d3d9 on NVIDIA GPU on Windows (with patch) on Windows",
|
| "--user",
|
| "commit-bot@chromium.org",
|
| - "[dummy hash for telemetry_gpu_new_test]",
|
| + "[dummy hash for telemetry_gpu_test]",
|
| "--",
|
| "webgl_conformance",
|
| "--show-stdout",
|
| "--browser=release",
|
| "-v",
|
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-angle=d3d9",
|
| - "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
|
| + "--output-format",
|
| + "json",
|
| + "--output-dir",
|
| + "${ISOLATED_OUTDIR}"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] webgl_conformance_d3d9 on NVIDIA GPU on Windows (with patch) on Windows",
|
| @@ -656,7 +667,7 @@
|
| "--tag",
|
| "buildnumber:571",
|
| "--tag",
|
| - "data:[dummy hash for telemetry_gpu_new_test]",
|
| + "data:[dummy hash for telemetry_gpu_test]",
|
| "--tag",
|
| "gpu_test:1",
|
| "--tag",
|
| @@ -679,7 +690,7 @@
|
| "stepname:webgl2_conformance on ATI GPU on Windows (with patch) on Windows",
|
| "--user",
|
| "commit-bot@chromium.org",
|
| - "[dummy hash for telemetry_gpu_new_test]",
|
| + "[dummy hash for telemetry_gpu_test]",
|
| "--",
|
| "webgl_conformance",
|
| "--show-stdout",
|
| @@ -688,7 +699,10 @@
|
| "--webgl-conformance-version=2.0.0",
|
| "--webgl2-only=true",
|
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
|
| - "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
|
| + "--output-format",
|
| + "json",
|
| + "--output-dir",
|
| + "${ISOLATED_OUTDIR}"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] webgl2_conformance on ATI GPU on Windows (with patch) on Windows",
|
| @@ -748,7 +762,7 @@
|
| "--tag",
|
| "buildnumber:571",
|
| "--tag",
|
| - "data:[dummy hash for telemetry_gpu_new_test]",
|
| + "data:[dummy hash for telemetry_gpu_test]",
|
| "--tag",
|
| "gpu_test:1",
|
| "--tag",
|
| @@ -771,14 +785,17 @@
|
| "stepname:webgl_conformance_d3d9 on ATI GPU on Windows (with patch) on Windows",
|
| "--user",
|
| "commit-bot@chromium.org",
|
| - "[dummy hash for telemetry_gpu_new_test]",
|
| + "[dummy hash for telemetry_gpu_test]",
|
| "--",
|
| "webgl_conformance",
|
| "--show-stdout",
|
| "--browser=release",
|
| "-v",
|
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-angle=d3d9",
|
| - "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
|
| + "--output-format",
|
| + "json",
|
| + "--output-dir",
|
| + "${ISOLATED_OUTDIR}"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] webgl_conformance_d3d9 on ATI GPU on Windows (with patch) on Windows",
|
| @@ -851,7 +868,7 @@
|
| "name": "webgl2_conformance on NVIDIA GPU on Windows (with patch) on Windows",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@outdir_json@{@@@",
|
| - "@@@STEP_LOG_LINE@outdir_json@ \"0\\\\output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
|
| + "@@@STEP_LOG_LINE@outdir_json@ \"0\\\\results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
|
| "@@@STEP_LOG_LINE@outdir_json@ \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
|
| "@@@STEP_LOG_LINE@outdir_json@}@@@",
|
| "@@@STEP_LOG_END@outdir_json@@@"
|
| @@ -877,7 +894,7 @@
|
| "name": "webgl_conformance_d3d9 on NVIDIA GPU on Windows (with patch) on Windows",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@outdir_json@{@@@",
|
| - "@@@STEP_LOG_LINE@outdir_json@ \"0\\\\output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
|
| + "@@@STEP_LOG_LINE@outdir_json@ \"0\\\\results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
|
| "@@@STEP_LOG_LINE@outdir_json@ \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
|
| "@@@STEP_LOG_LINE@outdir_json@}@@@",
|
| "@@@STEP_LOG_END@outdir_json@@@"
|
| @@ -937,7 +954,7 @@
|
| "name": "webgl2_conformance on ATI GPU on Windows (with patch) on Windows",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@outdir_json@{@@@",
|
| - "@@@STEP_LOG_LINE@outdir_json@ \"0\\\\output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
|
| + "@@@STEP_LOG_LINE@outdir_json@ \"0\\\\results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
|
| "@@@STEP_LOG_LINE@outdir_json@ \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
|
| "@@@STEP_LOG_LINE@outdir_json@}@@@",
|
| "@@@STEP_LOG_END@outdir_json@@@"
|
| @@ -963,7 +980,7 @@
|
| "name": "webgl_conformance_d3d9 on ATI GPU on Windows (with patch) on Windows",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@outdir_json@{@@@",
|
| - "@@@STEP_LOG_LINE@outdir_json@ \"0\\\\output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
|
| + "@@@STEP_LOG_LINE@outdir_json@ \"0\\\\results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
|
| "@@@STEP_LOG_LINE@outdir_json@ \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
|
| "@@@STEP_LOG_LINE@outdir_json@}@@@",
|
| "@@@STEP_LOG_END@outdir_json@@@",
|
|
|