| Index: scripts/slave/recipes/chromium_trybot.expected/swarming_time_out_is_handled_correctly.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/swarming_time_out_is_handled_correctly.json b/scripts/slave/recipes/chromium_trybot.expected/swarming_time_out_is_handled_correctly.json
|
| index 53ff8465292a0e321ec396a9506989dc77ee6131..ae7c3f38fa40b78cdc235375eee0eff8794f6b0e 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/swarming_time_out_is_handled_correctly.json
|
| +++ b/scripts/slave/recipes/chromium_trybot.expected/swarming_time_out_is_handled_correctly.json
|
| @@ -217,7 +217,7 @@
|
| "-u",
|
| "[SLAVE_BUILD]\\src\\build\\gyp_chromium",
|
| "--analyzer",
|
| - "{\"additional_compile_targets\": [\"chromium_builder_tests\", \"crash_service\"], \"files\": [\"foo.cc\"], \"test_targets\": [\"angle_unittests_run\", \"content_gl_tests_run\", \"gl_tests_run\", \"gl_unittests_run\", \"mini_installer\", \"tab_capture_end2end_tests_run\", \"telemetry_gpu_new_test_run\"]}",
|
| + "{\"additional_compile_targets\": [\"chromium_builder_tests\", \"crash_service\"], \"files\": [\"foo.cc\"], \"test_targets\": [\"angle_unittests_run\", \"content_gl_tests_run\", \"gl_tests_run\", \"gl_unittests_run\", \"mini_installer\", \"tab_capture_end2end_tests_run\", \"telemetry_gpu_test_run\"]}",
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| @@ -232,7 +232,7 @@
|
| "@@@STEP_LOG_LINE@json.output@ ], @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"status\": \"Found dependency\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"test_targets\": [@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"telemetry_gpu_new_test_run\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"telemetry_gpu_test_run\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ ]@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| "@@@STEP_LOG_END@json.output@@@",
|
| @@ -243,15 +243,15 @@
|
| "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"compile_targets\": [@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"All\", @@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_new_test_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_test_run\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"crash_service\"@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.compile_targets\": [@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"All\", @@@",
|
| - "@@@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@ \"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_unittests_run\", @@@",
|
| @@ -260,7 +260,7 @@
|
| "@@@STEP_LOG_LINE@analyze_details@ \"gl_unittests_run\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"mini_installer\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"tab_capture_end2end_tests_run\", @@@",
|
| - "@@@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@@@"
|
| @@ -309,7 +309,7 @@
|
| "--ninja-ensure-up-to-date",
|
| "--",
|
| "All",
|
| - "telemetry_gpu_new_test_run",
|
| + "telemetry_gpu_test_run",
|
| "crash_service"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| @@ -344,13 +344,13 @@
|
| "--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"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "isolate tests",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@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@@@"
|
| ]
|
| @@ -407,7 +407,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",
|
| @@ -430,7 +430,7 @@
|
| "stepname:maps_pixel_test 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]",
|
| "--",
|
| "maps",
|
| "--show-stdout",
|
| @@ -501,7 +501,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",
|
| @@ -524,7 +524,7 @@
|
| "stepname:pixel_test 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]",
|
| "--",
|
| "pixel",
|
| "--show-stdout",
|
| @@ -600,7 +600,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",
|
| @@ -623,7 +623,7 @@
|
| "stepname:webgl_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",
|
| @@ -690,7 +690,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",
|
| @@ -713,7 +713,7 @@
|
| "stepname:context_lost 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]",
|
| "--",
|
| "context_lost",
|
| "--show-stdout",
|
| @@ -780,7 +780,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",
|
| @@ -803,7 +803,7 @@
|
| "stepname:memory_test 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]",
|
| "--",
|
| "memory_test",
|
| "--show-stdout",
|
| @@ -870,7 +870,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",
|
| @@ -893,7 +893,7 @@
|
| "stepname:trace_test 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]",
|
| "--",
|
| "trace_test",
|
| "--show-stdout",
|
| @@ -960,7 +960,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",
|
| @@ -983,7 +983,7 @@
|
| "stepname:screenshot_sync 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]",
|
| "--",
|
| "screenshot_sync",
|
| "--show-stdout",
|
| @@ -1050,7 +1050,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",
|
| @@ -1073,7 +1073,7 @@
|
| "stepname:hardware_accelerated_feature 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]",
|
| "--",
|
| "hardware_accelerated_feature",
|
| "--show-stdout",
|
| @@ -1140,7 +1140,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",
|
| @@ -1163,7 +1163,7 @@
|
| "stepname:gpu_process_launch 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]",
|
| "--",
|
| "gpu_process",
|
| "--show-stdout",
|
| @@ -1230,7 +1230,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",
|
| @@ -1253,7 +1253,7 @@
|
| "stepname:gpu_rasterization 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]",
|
| "--",
|
| "gpu_rasterization",
|
| "--show-stdout",
|
| @@ -1324,7 +1324,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",
|
| @@ -1347,7 +1347,7 @@
|
| "stepname:maps_pixel_test 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]",
|
| "--",
|
| "maps",
|
| "--show-stdout",
|
| @@ -1418,7 +1418,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",
|
| @@ -1441,7 +1441,7 @@
|
| "stepname:pixel_test 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]",
|
| "--",
|
| "pixel",
|
| "--show-stdout",
|
| @@ -1517,7 +1517,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",
|
| @@ -1540,7 +1540,7 @@
|
| "stepname:webgl_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",
|
| @@ -1607,7 +1607,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",
|
| @@ -1630,7 +1630,7 @@
|
| "stepname:context_lost 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]",
|
| "--",
|
| "context_lost",
|
| "--show-stdout",
|
| @@ -1697,7 +1697,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",
|
| @@ -1720,7 +1720,7 @@
|
| "stepname:memory_test 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]",
|
| "--",
|
| "memory_test",
|
| "--show-stdout",
|
| @@ -1787,7 +1787,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",
|
| @@ -1810,7 +1810,7 @@
|
| "stepname:trace_test 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]",
|
| "--",
|
| "trace_test",
|
| "--show-stdout",
|
| @@ -1877,7 +1877,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",
|
| @@ -1900,7 +1900,7 @@
|
| "stepname:screenshot_sync 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]",
|
| "--",
|
| "screenshot_sync",
|
| "--show-stdout",
|
| @@ -1967,7 +1967,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",
|
| @@ -1990,7 +1990,7 @@
|
| "stepname:hardware_accelerated_feature 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]",
|
| "--",
|
| "hardware_accelerated_feature",
|
| "--show-stdout",
|
| @@ -2057,7 +2057,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",
|
| @@ -2080,7 +2080,7 @@
|
| "stepname:gpu_process_launch 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]",
|
| "--",
|
| "gpu_process",
|
| "--show-stdout",
|
| @@ -2147,7 +2147,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",
|
| @@ -2170,7 +2170,7 @@
|
| "stepname:gpu_rasterization 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]",
|
| "--",
|
| "gpu_rasterization",
|
| "--show-stdout",
|
|
|