| Index: scripts/slave/recipes/gpu/build_and_test.expected/mac_release_tryserver_blink.json
|
| diff --git a/scripts/slave/recipes/gpu/build_and_test.expected/mac_release_tryserver_blink.json b/scripts/slave/recipes/gpu/build_and_test.expected/mac_release_tryserver_blink.json
|
| index 93063eaf94dbbff2db5749ec16fa2ad2c6aa35c1..f3ca49ae0a321fc79ea97a057eadca0e32826652 100644
|
| --- a/scripts/slave/recipes/gpu/build_and_test.expected/mac_release_tryserver_blink.json
|
| +++ b/scripts/slave/recipes/gpu/build_and_test.expected/mac_release_tryserver_blink.json
|
| @@ -178,7 +178,7 @@
|
| "-u",
|
| "[SLAVE_BUILD]/src/build/gyp_chromium",
|
| "--analyzer",
|
| - "{\"additional_compile_targets\": [], \"files\": [\"third_party/WebKit/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\": [\"third_party/WebKit/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]",
|
| @@ -201,7 +201,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\": [@@@",
|
| @@ -212,7 +212,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@@@"
|
| @@ -277,8 +277,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)",
|
| @@ -305,7 +305,7 @@
|
| "[SLAVE_BUILD]/src/out/Release/gles2_conform_test.isolated.gen.json",
|
| "[SLAVE_BUILD]/src/out/Release/gpu_unittests.isolated.gen.json",
|
| "[SLAVE_BUILD]/src/out/Release/tab_capture_end2end_tests.isolated.gen.json",
|
| - "[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",
|
| @@ -318,10 +318,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]\"}@@@"
|
| ]
|
| },
|
| {
|
| @@ -474,7 +474,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",
|
| @@ -507,7 +507,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",
|
| @@ -545,7 +545,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",
|
| @@ -574,7 +574,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",
|
| @@ -603,7 +603,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",
|
| @@ -632,7 +632,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",
|
| @@ -661,7 +661,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",
|
| @@ -690,7 +690,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",
|
| @@ -719,7 +719,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",
|
| @@ -748,7 +748,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",
|
|
|