| Index: scripts/slave/recipes/gpu/build_and_test.expected/win_debug_tryserver.json
|
| diff --git a/scripts/slave/recipes/gpu/build_and_test.expected/win_debug_tryserver.json b/scripts/slave/recipes/gpu/build_and_test.expected/win_debug_tryserver.json
|
| index cadf139811051f19701028d063ca870ef6dc7a0d..432c1d6d2d1253d416cb02893d11f07a7a0a8574 100644
|
| --- a/scripts/slave/recipes/gpu/build_and_test.expected/win_debug_tryserver.json
|
| +++ b/scripts/slave/recipes/gpu/build_and_test.expected/win_debug_tryserver.json
|
| @@ -176,7 +176,7 @@
|
| "-u",
|
| "[SLAVE_BUILD]\\src\\build\\gyp_chromium",
|
| "--analyzer",
|
| - "{\"additional_compile_targets\": [], \"files\": [\"foo.cc\"], \"test_targets\": [\"angle_unittests_run\", \"content_gl_tests_run\", \"gl_tests_run\", \"gl_unittests_run\", \"gles2_conform_test_run\", \"gpu_unittests_run\", \"tab_capture_end2end_tests_run\", \"telemetry_gpu_new_test_run\"]}",
|
| + "{\"additional_compile_targets\": [], \"files\": [\"foo.cc\"], \"test_targets\": [\"angle_unittests_run\", \"content_gl_tests_run\", \"gl_tests_run\", \"gl_unittests_run\", \"gles2_conform_test_run\", \"gpu_unittests_run\", \"tab_capture_end2end_tests_run\", \"telemetry_gpu_test_run\"]}",
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| @@ -199,7 +199,7 @@
|
| "@@@STEP_LOG_LINE@json.output@ \"gles2_conform_test\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"gpu_unittests\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"tab_capture_end2end_tests\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"telemetry_gpu_new_test\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"telemetry_gpu_test\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ ], @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"status\": \"Found dependency\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"test_targets\": [@@@",
|
| @@ -210,7 +210,7 @@
|
| "@@@STEP_LOG_LINE@json.output@ \"gles2_conform_test_run\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"gpu_unittests_run\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"tab_capture_end2end_tests_run\", @@@",
|
| - "@@@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@@@"
|
| @@ -255,8 +255,8 @@
|
| "gpu_unittests_run",
|
| "tab_capture_end2end_tests",
|
| "tab_capture_end2end_tests_run",
|
| - "telemetry_gpu_new_test",
|
| - "telemetry_gpu_new_test_run"
|
| + "telemetry_gpu_test",
|
| + "telemetry_gpu_test_run"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "compile (with patch)",
|
| @@ -283,7 +283,7 @@
|
| "[SLAVE_BUILD]\\src\\out\\Debug\\gles2_conform_test.isolated.gen.json",
|
| "[SLAVE_BUILD]\\src\\out\\Debug\\gpu_unittests.isolated.gen.json",
|
| "[SLAVE_BUILD]\\src\\out\\Debug\\tab_capture_end2end_tests.isolated.gen.json",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug\\telemetry_gpu_new_test.isolated.gen.json"
|
| + "[SLAVE_BUILD]\\src\\out\\Debug\\telemetry_gpu_test.isolated.gen.json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "isolate tests",
|
| @@ -296,10 +296,10 @@
|
| "@@@STEP_LOG_LINE@json.output@ \"gles2_conform_test\": \"[dummy hash for gles2_conform_test]\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"gpu_unittests\": \"[dummy hash for gpu_unittests]\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"tab_capture_end2end_tests\": \"[dummy hash for tab_capture_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@@@",
|
| - "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"angle_unittests\": \"[dummy hash for angle_unittests]\", \"content_gl_tests\": \"[dummy hash for content_gl_tests]\", \"gl_tests\": \"[dummy hash for gl_tests]\", \"gl_unittests\": \"[dummy hash for gl_unittests]\", \"gles2_conform_test\": \"[dummy hash for gles2_conform_test]\", \"gpu_unittests\": \"[dummy hash for gpu_unittests]\", \"tab_capture_end2end_tests\": \"[dummy hash for tab_capture_end2end_tests]\", \"telemetry_gpu_new_test\": \"[dummy hash for telemetry_gpu_new_test]\"}@@@"
|
| + "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"angle_unittests\": \"[dummy hash for angle_unittests]\", \"content_gl_tests\": \"[dummy hash for content_gl_tests]\", \"gl_tests\": \"[dummy hash for gl_tests]\", \"gl_unittests\": \"[dummy hash for gl_unittests]\", \"gles2_conform_test\": \"[dummy hash for gles2_conform_test]\", \"gpu_unittests\": \"[dummy hash for gpu_unittests]\", \"tab_capture_end2end_tests\": \"[dummy hash for tab_capture_end2end_tests]\", \"telemetry_gpu_test\": \"[dummy hash for telemetry_gpu_test]\"}@@@"
|
| ]
|
| },
|
| {
|
| @@ -452,7 +452,7 @@
|
| "-u",
|
| "[SLAVE_BUILD]\\src\\tools\\swarming_client\\run_isolated.py",
|
| "--isolated",
|
| - "[dummy hash for telemetry_gpu_new_test]",
|
| + "[dummy hash for telemetry_gpu_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| "--verbose",
|
| @@ -485,7 +485,7 @@
|
| "-u",
|
| "[SLAVE_BUILD]\\src\\tools\\swarming_client\\run_isolated.py",
|
| "--isolated",
|
| - "[dummy hash for telemetry_gpu_new_test]",
|
| + "[dummy hash for telemetry_gpu_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| "--verbose",
|
| @@ -523,7 +523,7 @@
|
| "-u",
|
| "[SLAVE_BUILD]\\src\\tools\\swarming_client\\run_isolated.py",
|
| "--isolated",
|
| - "[dummy hash for telemetry_gpu_new_test]",
|
| + "[dummy hash for telemetry_gpu_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| "--verbose",
|
| @@ -552,7 +552,7 @@
|
| "-u",
|
| "[SLAVE_BUILD]\\src\\tools\\swarming_client\\run_isolated.py",
|
| "--isolated",
|
| - "[dummy hash for telemetry_gpu_new_test]",
|
| + "[dummy hash for telemetry_gpu_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| "--verbose",
|
| @@ -581,7 +581,7 @@
|
| "-u",
|
| "[SLAVE_BUILD]\\src\\tools\\swarming_client\\run_isolated.py",
|
| "--isolated",
|
| - "[dummy hash for telemetry_gpu_new_test]",
|
| + "[dummy hash for telemetry_gpu_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| "--verbose",
|
| @@ -610,7 +610,7 @@
|
| "-u",
|
| "[SLAVE_BUILD]\\src\\tools\\swarming_client\\run_isolated.py",
|
| "--isolated",
|
| - "[dummy hash for telemetry_gpu_new_test]",
|
| + "[dummy hash for telemetry_gpu_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| "--verbose",
|
| @@ -639,7 +639,7 @@
|
| "-u",
|
| "[SLAVE_BUILD]\\src\\tools\\swarming_client\\run_isolated.py",
|
| "--isolated",
|
| - "[dummy hash for telemetry_gpu_new_test]",
|
| + "[dummy hash for telemetry_gpu_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| "--verbose",
|
| @@ -668,7 +668,7 @@
|
| "-u",
|
| "[SLAVE_BUILD]\\src\\tools\\swarming_client\\run_isolated.py",
|
| "--isolated",
|
| - "[dummy hash for telemetry_gpu_new_test]",
|
| + "[dummy hash for telemetry_gpu_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| "--verbose",
|
| @@ -697,7 +697,7 @@
|
| "-u",
|
| "[SLAVE_BUILD]\\src\\tools\\swarming_client\\run_isolated.py",
|
| "--isolated",
|
| - "[dummy hash for telemetry_gpu_new_test]",
|
| + "[dummy hash for telemetry_gpu_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| "--verbose",
|
| @@ -726,7 +726,7 @@
|
| "-u",
|
| "[SLAVE_BUILD]\\src\\tools\\swarming_client\\run_isolated.py",
|
| "--isolated",
|
| - "[dummy hash for telemetry_gpu_new_test]",
|
| + "[dummy hash for telemetry_gpu_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| "--verbose",
|
|
|