| Index: scripts/slave/recipes/gpu/build_and_test.expected/linux_debug_tryserver.json
|
| diff --git a/scripts/slave/recipes/gpu/build_and_test.expected/linux_debug_tryserver.json b/scripts/slave/recipes/gpu/build_and_test.expected/linux_debug_tryserver.json
|
| index fd03ed9c1a1530d34c225b12f74e1aab970beecc..e1d69d2c3d219e7389aa9228f7e7f033a87bde49 100644
|
| --- a/scripts/slave/recipes/gpu/build_and_test.expected/linux_debug_tryserver.json
|
| +++ b/scripts/slave/recipes/gpu/build_and_test.expected/linux_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_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_new_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_test\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"telemetry_gpu_new_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_test_run\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"telemetry_gpu_new_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_test",
|
| - "telemetry_gpu_test_run"
|
| + "telemetry_gpu_new_test",
|
| + "telemetry_gpu_new_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_test.isolated.gen.json"
|
| + "[SLAVE_BUILD]/src/out/Debug/telemetry_gpu_new_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_test\": \"[dummy hash for telemetry_gpu_test]\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"telemetry_gpu_new_test\": \"[dummy hash for telemetry_gpu_new_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_test\": \"[dummy hash for telemetry_gpu_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_new_test\": \"[dummy hash for telemetry_gpu_new_test]\"}@@@"
|
| ]
|
| },
|
| {
|
| @@ -460,38 +460,18 @@
|
| "name": "gl_unittests"
|
| },
|
| {
|
| - "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/runtest.py",
|
| - "--target",
|
| - "Debug",
|
| - "--no-xvfb",
|
| - "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--annotate=gtest",
|
| - "--test-type=maps_pixel_test",
|
| - "--step-name=maps_pixel_test",
|
| - "--generate-json-file",
|
| - "--results-directory=[SLAVE_BUILD]/gtest-results/maps_pixel_test",
|
| - "--builder-name=TestBuilder",
|
| - "--slave-name=TestSlavename",
|
| - "--build-number=571",
|
| - "--run-python-script",
|
| - "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "--webkit-revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "[SLAVE_BUILD]/src/tools/swarming_client/run_isolated.py",
|
| "--isolated",
|
| - "[dummy hash for telemetry_gpu_test]",
|
| + "[dummy hash for telemetry_gpu_new_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| + "--verbose",
|
| "--",
|
| "maps",
|
| "--show-stdout",
|
| - "--output-format=gtest",
|
| "--browser=debug",
|
| "-v",
|
| "--build-revision",
|
| @@ -499,50 +479,32 @@
|
| "--test-machine-name",
|
| "TestBuilder",
|
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
|
| - "--output-format",
|
| - "json",
|
| - "--output-dir",
|
| - "/path/to/tmp/"
|
| + "--isolated-script-test-output",
|
| + "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
|
| - },
|
| - "name": "maps_pixel_test"
|
| + "name": "maps_pixel_test",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"failures\": [], @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"valid\": true@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| + ]
|
| },
|
| {
|
| - "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/runtest.py",
|
| - "--target",
|
| - "Debug",
|
| - "--no-xvfb",
|
| - "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--annotate=gtest",
|
| - "--test-type=pixel_test",
|
| - "--step-name=pixel_test",
|
| - "--generate-json-file",
|
| - "--results-directory=[SLAVE_BUILD]/gtest-results/pixel_test",
|
| - "--builder-name=TestBuilder",
|
| - "--slave-name=TestSlavename",
|
| - "--build-number=571",
|
| - "--run-python-script",
|
| - "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "--webkit-revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "[SLAVE_BUILD]/src/tools/swarming_client/run_isolated.py",
|
| "--isolated",
|
| - "[dummy hash for telemetry_gpu_test]",
|
| + "[dummy hash for telemetry_gpu_new_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| + "--verbose",
|
| "--",
|
| "pixel",
|
| "--show-stdout",
|
| - "--output-format=gtest",
|
| "--browser=debug",
|
| "-v",
|
| "--build-revision",
|
| @@ -555,379 +517,235 @@
|
| "--test-machine-name",
|
| "TestBuilder",
|
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
|
| - "--output-format",
|
| - "json",
|
| - "--output-dir",
|
| - "/path/to/tmp/"
|
| + "--isolated-script-test-output",
|
| + "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
|
| - },
|
| - "name": "pixel_test"
|
| + "name": "pixel_test",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"failures\": [], @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"valid\": true@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| + ]
|
| },
|
| {
|
| - "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/runtest.py",
|
| - "--target",
|
| - "Debug",
|
| - "--no-xvfb",
|
| - "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--annotate=gtest",
|
| - "--test-type=webgl_conformance_tests",
|
| - "--step-name=webgl_conformance_tests",
|
| - "--generate-json-file",
|
| - "--results-directory=[SLAVE_BUILD]/gtest-results/webgl_conformance_tests",
|
| - "--builder-name=TestBuilder",
|
| - "--slave-name=TestSlavename",
|
| - "--build-number=571",
|
| - "--run-python-script",
|
| - "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "--webkit-revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "[SLAVE_BUILD]/src/tools/swarming_client/run_isolated.py",
|
| "--isolated",
|
| - "[dummy hash for telemetry_gpu_test]",
|
| + "[dummy hash for telemetry_gpu_new_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| + "--verbose",
|
| "--",
|
| "webgl_conformance",
|
| "--show-stdout",
|
| - "--output-format=gtest",
|
| "--browser=debug",
|
| "-v",
|
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
|
| - "--output-format",
|
| - "json",
|
| - "--output-dir",
|
| - "/path/to/tmp/"
|
| + "--isolated-script-test-output",
|
| + "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
|
| - },
|
| - "name": "webgl_conformance_tests"
|
| + "name": "webgl_conformance_tests",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"failures\": [], @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"valid\": true@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| + ]
|
| },
|
| {
|
| - "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/runtest.py",
|
| - "--target",
|
| - "Debug",
|
| - "--no-xvfb",
|
| - "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--annotate=gtest",
|
| - "--test-type=context_lost_tests",
|
| - "--step-name=context_lost_tests",
|
| - "--generate-json-file",
|
| - "--results-directory=[SLAVE_BUILD]/gtest-results/context_lost_tests",
|
| - "--builder-name=TestBuilder",
|
| - "--slave-name=TestSlavename",
|
| - "--build-number=571",
|
| - "--run-python-script",
|
| - "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "--webkit-revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "[SLAVE_BUILD]/src/tools/swarming_client/run_isolated.py",
|
| "--isolated",
|
| - "[dummy hash for telemetry_gpu_test]",
|
| + "[dummy hash for telemetry_gpu_new_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| + "--verbose",
|
| "--",
|
| "context_lost",
|
| "--show-stdout",
|
| - "--output-format=gtest",
|
| "--browser=debug",
|
| "-v",
|
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
|
| - "--output-format",
|
| - "json",
|
| - "--output-dir",
|
| - "/path/to/tmp/"
|
| + "--isolated-script-test-output",
|
| + "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
|
| - },
|
| - "name": "context_lost_tests"
|
| + "name": "context_lost_tests",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"failures\": [], @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"valid\": true@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| + ]
|
| },
|
| {
|
| - "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/runtest.py",
|
| - "--target",
|
| - "Debug",
|
| - "--no-xvfb",
|
| - "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--annotate=gtest",
|
| - "--test-type=memory_test",
|
| - "--step-name=memory_test",
|
| - "--generate-json-file",
|
| - "--results-directory=[SLAVE_BUILD]/gtest-results/memory_test",
|
| - "--builder-name=TestBuilder",
|
| - "--slave-name=TestSlavename",
|
| - "--build-number=571",
|
| - "--run-python-script",
|
| - "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "--webkit-revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "[SLAVE_BUILD]/src/tools/swarming_client/run_isolated.py",
|
| "--isolated",
|
| - "[dummy hash for telemetry_gpu_test]",
|
| + "[dummy hash for telemetry_gpu_new_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| + "--verbose",
|
| "--",
|
| "memory_test",
|
| "--show-stdout",
|
| - "--output-format=gtest",
|
| "--browser=debug",
|
| "-v",
|
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
|
| - "--output-format",
|
| - "json",
|
| - "--output-dir",
|
| - "/path/to/tmp/"
|
| + "--isolated-script-test-output",
|
| + "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
|
| - },
|
| - "name": "memory_test"
|
| + "name": "memory_test",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"failures\": [], @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"valid\": true@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| + ]
|
| },
|
| {
|
| - "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/runtest.py",
|
| - "--target",
|
| - "Debug",
|
| - "--no-xvfb",
|
| - "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--annotate=gtest",
|
| - "--test-type=trace_test",
|
| - "--step-name=trace_test",
|
| - "--generate-json-file",
|
| - "--results-directory=[SLAVE_BUILD]/gtest-results/trace_test",
|
| - "--builder-name=TestBuilder",
|
| - "--slave-name=TestSlavename",
|
| - "--build-number=571",
|
| - "--run-python-script",
|
| - "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "--webkit-revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "[SLAVE_BUILD]/src/tools/swarming_client/run_isolated.py",
|
| "--isolated",
|
| - "[dummy hash for telemetry_gpu_test]",
|
| + "[dummy hash for telemetry_gpu_new_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| + "--verbose",
|
| "--",
|
| "trace_test",
|
| "--show-stdout",
|
| - "--output-format=gtest",
|
| "--browser=debug",
|
| "-v",
|
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
|
| - "--output-format",
|
| - "json",
|
| - "--output-dir",
|
| - "/path/to/tmp/"
|
| + "--isolated-script-test-output",
|
| + "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
|
| - },
|
| - "name": "trace_test"
|
| + "name": "trace_test",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"failures\": [], @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"valid\": true@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| + ]
|
| },
|
| {
|
| - "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/runtest.py",
|
| - "--target",
|
| - "Debug",
|
| - "--no-xvfb",
|
| - "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--annotate=gtest",
|
| - "--test-type=screenshot_sync_tests",
|
| - "--step-name=screenshot_sync_tests",
|
| - "--generate-json-file",
|
| - "--results-directory=[SLAVE_BUILD]/gtest-results/screenshot_sync_tests",
|
| - "--builder-name=TestBuilder",
|
| - "--slave-name=TestSlavename",
|
| - "--build-number=571",
|
| - "--run-python-script",
|
| - "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "--webkit-revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "[SLAVE_BUILD]/src/tools/swarming_client/run_isolated.py",
|
| "--isolated",
|
| - "[dummy hash for telemetry_gpu_test]",
|
| + "[dummy hash for telemetry_gpu_new_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| + "--verbose",
|
| "--",
|
| "screenshot_sync",
|
| "--show-stdout",
|
| - "--output-format=gtest",
|
| "--browser=debug",
|
| "-v",
|
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
|
| - "--output-format",
|
| - "json",
|
| - "--output-dir",
|
| - "/path/to/tmp/"
|
| + "--isolated-script-test-output",
|
| + "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
|
| - },
|
| - "name": "screenshot_sync_tests"
|
| + "name": "screenshot_sync_tests",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"failures\": [], @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"valid\": true@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| + ]
|
| },
|
| {
|
| - "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/runtest.py",
|
| - "--target",
|
| - "Debug",
|
| - "--no-xvfb",
|
| - "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--annotate=gtest",
|
| - "--test-type=hardware_accelerated_feature_tests",
|
| - "--step-name=hardware_accelerated_feature_tests",
|
| - "--generate-json-file",
|
| - "--results-directory=[SLAVE_BUILD]/gtest-results/hardware_accelerated_feature_tests",
|
| - "--builder-name=TestBuilder",
|
| - "--slave-name=TestSlavename",
|
| - "--build-number=571",
|
| - "--run-python-script",
|
| - "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "--webkit-revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "[SLAVE_BUILD]/src/tools/swarming_client/run_isolated.py",
|
| "--isolated",
|
| - "[dummy hash for telemetry_gpu_test]",
|
| + "[dummy hash for telemetry_gpu_new_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| + "--verbose",
|
| "--",
|
| "hardware_accelerated_feature",
|
| "--show-stdout",
|
| - "--output-format=gtest",
|
| "--browser=debug",
|
| "-v",
|
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
|
| - "--output-format",
|
| - "json",
|
| - "--output-dir",
|
| - "/path/to/tmp/"
|
| + "--isolated-script-test-output",
|
| + "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
|
| - },
|
| - "name": "hardware_accelerated_feature_tests"
|
| + "name": "hardware_accelerated_feature_tests",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"failures\": [], @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"valid\": true@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| + ]
|
| },
|
| {
|
| - "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/runtest.py",
|
| - "--target",
|
| - "Debug",
|
| - "--no-xvfb",
|
| - "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--annotate=gtest",
|
| - "--test-type=gpu_process_launch_tests",
|
| - "--step-name=gpu_process_launch_tests",
|
| - "--generate-json-file",
|
| - "--results-directory=[SLAVE_BUILD]/gtest-results/gpu_process_launch_tests",
|
| - "--builder-name=TestBuilder",
|
| - "--slave-name=TestSlavename",
|
| - "--build-number=571",
|
| - "--run-python-script",
|
| - "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "--webkit-revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "[SLAVE_BUILD]/src/tools/swarming_client/run_isolated.py",
|
| "--isolated",
|
| - "[dummy hash for telemetry_gpu_test]",
|
| + "[dummy hash for telemetry_gpu_new_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| + "--verbose",
|
| "--",
|
| "gpu_process",
|
| "--show-stdout",
|
| - "--output-format=gtest",
|
| "--browser=debug",
|
| "-v",
|
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
|
| - "--output-format",
|
| - "json",
|
| - "--output-dir",
|
| - "/path/to/tmp/"
|
| + "--isolated-script-test-output",
|
| + "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
|
| - },
|
| - "name": "gpu_process_launch_tests"
|
| + "name": "gpu_process_launch_tests",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"failures\": [], @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"valid\": true@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| + ]
|
| },
|
| {
|
| - "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/runtest.py",
|
| - "--target",
|
| - "Debug",
|
| - "--no-xvfb",
|
| - "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--annotate=gtest",
|
| - "--test-type=gpu_rasterization_tests",
|
| - "--step-name=gpu_rasterization_tests",
|
| - "--generate-json-file",
|
| - "--results-directory=[SLAVE_BUILD]/gtest-results/gpu_rasterization_tests",
|
| - "--builder-name=TestBuilder",
|
| - "--slave-name=TestSlavename",
|
| - "--build-number=571",
|
| - "--run-python-script",
|
| - "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "--webkit-revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "[SLAVE_BUILD]/src/tools/swarming_client/run_isolated.py",
|
| "--isolated",
|
| - "[dummy hash for telemetry_gpu_test]",
|
| + "[dummy hash for telemetry_gpu_new_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| + "--verbose",
|
| "--",
|
| "gpu_rasterization",
|
| "--show-stdout",
|
| - "--output-format=gtest",
|
| "--browser=debug",
|
| "-v",
|
| "--build-revision",
|
| @@ -935,16 +753,18 @@
|
| "--test-machine-name",
|
| "TestBuilder",
|
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
|
| - "--output-format",
|
| - "json",
|
| - "--output-dir",
|
| - "/path/to/tmp/"
|
| + "--isolated-script-test-output",
|
| + "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
|
| - },
|
| - "name": "gpu_rasterization_tests"
|
| + "name": "gpu_rasterization_tests",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"failures\": [], @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"valid\": true@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| + ]
|
| },
|
| {
|
| "name": "$result",
|
|
|