| Index: scripts/slave/recipes/gpu/build_and_test.expected/mac_release.json
|
| diff --git a/scripts/slave/recipes/gpu/build_and_test.expected/mac_release.json b/scripts/slave/recipes/gpu/build_and_test.expected/mac_release.json
|
| index 10ede066ca14e83e11a0da1c82343726435ba93c..b737c74182811d62069840529550cad529a037ce 100644
|
| --- a/scripts/slave/recipes/gpu/build_and_test.expected/mac_release.json
|
| +++ b/scripts/slave/recipes/gpu/build_and_test.expected/mac_release.json
|
| @@ -168,7 +168,7 @@
|
| "gles2_conform_test_run",
|
| "gpu_unittests_run",
|
| "tab_capture_end2end_tests_run",
|
| - "telemetry_gpu_new_test_run"
|
| + "telemetry_gpu_test_run"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "compile",
|
| @@ -195,7 +195,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",
|
| @@ -208,10 +208,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]\"}@@@"
|
| ]
|
| },
|
| {
|
| @@ -359,18 +359,37 @@
|
| "name": "gl_unittests"
|
| },
|
| {
|
| + "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "[BUILD]/scripts/slave/runtest.py",
|
| + "--target",
|
| + "Release",
|
| + "--factory-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--build-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"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_new_test]",
|
| + "[dummy hash for telemetry_gpu_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| - "--verbose",
|
| "--",
|
| "maps",
|
| "--show-stdout",
|
| + "--output-format=gtest",
|
| "--browser=release",
|
| "-v",
|
| "--build-revision",
|
| @@ -378,32 +397,46 @@
|
| "--test-machine-name",
|
| "TestBuilder",
|
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --vmodule=startup_browser_creator=2",
|
| - "--isolated-script-test-output",
|
| - "/path/to/tmp/json"
|
| + "--output-format",
|
| + "json",
|
| + "--output-dir",
|
| + "/path/to/tmp/"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "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@@@"
|
| - ]
|
| + "name": "maps_pixel_test"
|
| },
|
| {
|
| + "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "[BUILD]/scripts/slave/runtest.py",
|
| + "--target",
|
| + "Release",
|
| + "--factory-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--build-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"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_new_test]",
|
| + "[dummy hash for telemetry_gpu_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| - "--verbose",
|
| "--",
|
| "pixel",
|
| "--show-stdout",
|
| + "--output-format=gtest",
|
| "--browser=release",
|
| "-v",
|
| "--build-revision",
|
| @@ -416,235 +449,347 @@
|
| "--test-machine-name",
|
| "TestBuilder",
|
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --vmodule=startup_browser_creator=2",
|
| - "--isolated-script-test-output",
|
| - "/path/to/tmp/json"
|
| + "--output-format",
|
| + "json",
|
| + "--output-dir",
|
| + "/path/to/tmp/"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "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@@@"
|
| - ]
|
| + "name": "pixel_test"
|
| },
|
| {
|
| + "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "[BUILD]/scripts/slave/runtest.py",
|
| + "--target",
|
| + "Release",
|
| + "--factory-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--build-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"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_new_test]",
|
| + "[dummy hash for telemetry_gpu_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| - "--verbose",
|
| "--",
|
| "webgl_conformance",
|
| "--show-stdout",
|
| + "--output-format=gtest",
|
| "--browser=release",
|
| "-v",
|
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --vmodule=startup_browser_creator=2",
|
| - "--isolated-script-test-output",
|
| - "/path/to/tmp/json"
|
| + "--output-format",
|
| + "json",
|
| + "--output-dir",
|
| + "/path/to/tmp/"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "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@@@"
|
| - ]
|
| + "name": "webgl_conformance_tests"
|
| },
|
| {
|
| + "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "[BUILD]/scripts/slave/runtest.py",
|
| + "--target",
|
| + "Release",
|
| + "--factory-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--build-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"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_new_test]",
|
| + "[dummy hash for telemetry_gpu_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| - "--verbose",
|
| "--",
|
| "context_lost",
|
| "--show-stdout",
|
| + "--output-format=gtest",
|
| "--browser=release",
|
| "-v",
|
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --vmodule=startup_browser_creator=2",
|
| - "--isolated-script-test-output",
|
| - "/path/to/tmp/json"
|
| + "--output-format",
|
| + "json",
|
| + "--output-dir",
|
| + "/path/to/tmp/"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "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@@@"
|
| - ]
|
| + "name": "context_lost_tests"
|
| },
|
| {
|
| + "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "[BUILD]/scripts/slave/runtest.py",
|
| + "--target",
|
| + "Release",
|
| + "--factory-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--build-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"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_new_test]",
|
| + "[dummy hash for telemetry_gpu_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| - "--verbose",
|
| "--",
|
| "memory_test",
|
| "--show-stdout",
|
| + "--output-format=gtest",
|
| "--browser=release",
|
| "-v",
|
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --vmodule=startup_browser_creator=2",
|
| - "--isolated-script-test-output",
|
| - "/path/to/tmp/json"
|
| + "--output-format",
|
| + "json",
|
| + "--output-dir",
|
| + "/path/to/tmp/"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "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@@@"
|
| - ]
|
| + "name": "memory_test"
|
| },
|
| {
|
| + "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "[BUILD]/scripts/slave/runtest.py",
|
| + "--target",
|
| + "Release",
|
| + "--factory-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--build-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"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_new_test]",
|
| + "[dummy hash for telemetry_gpu_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| - "--verbose",
|
| "--",
|
| "trace_test",
|
| "--show-stdout",
|
| + "--output-format=gtest",
|
| "--browser=release",
|
| "-v",
|
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --vmodule=startup_browser_creator=2",
|
| - "--isolated-script-test-output",
|
| - "/path/to/tmp/json"
|
| + "--output-format",
|
| + "json",
|
| + "--output-dir",
|
| + "/path/to/tmp/"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "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@@@"
|
| - ]
|
| + "name": "trace_test"
|
| },
|
| {
|
| + "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "[BUILD]/scripts/slave/runtest.py",
|
| + "--target",
|
| + "Release",
|
| + "--factory-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--build-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"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_new_test]",
|
| + "[dummy hash for telemetry_gpu_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| - "--verbose",
|
| "--",
|
| "screenshot_sync",
|
| "--show-stdout",
|
| + "--output-format=gtest",
|
| "--browser=release",
|
| "-v",
|
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --vmodule=startup_browser_creator=2",
|
| - "--isolated-script-test-output",
|
| - "/path/to/tmp/json"
|
| + "--output-format",
|
| + "json",
|
| + "--output-dir",
|
| + "/path/to/tmp/"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "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@@@"
|
| - ]
|
| + "name": "screenshot_sync_tests"
|
| },
|
| {
|
| + "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "[BUILD]/scripts/slave/runtest.py",
|
| + "--target",
|
| + "Release",
|
| + "--factory-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--build-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"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_new_test]",
|
| + "[dummy hash for telemetry_gpu_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| - "--verbose",
|
| "--",
|
| "hardware_accelerated_feature",
|
| "--show-stdout",
|
| + "--output-format=gtest",
|
| "--browser=release",
|
| "-v",
|
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --vmodule=startup_browser_creator=2",
|
| - "--isolated-script-test-output",
|
| - "/path/to/tmp/json"
|
| + "--output-format",
|
| + "json",
|
| + "--output-dir",
|
| + "/path/to/tmp/"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "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@@@"
|
| - ]
|
| + "name": "hardware_accelerated_feature_tests"
|
| },
|
| {
|
| + "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "[BUILD]/scripts/slave/runtest.py",
|
| + "--target",
|
| + "Release",
|
| + "--factory-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--build-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"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_new_test]",
|
| + "[dummy hash for telemetry_gpu_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| - "--verbose",
|
| "--",
|
| "gpu_process",
|
| "--show-stdout",
|
| + "--output-format=gtest",
|
| "--browser=release",
|
| "-v",
|
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --vmodule=startup_browser_creator=2",
|
| - "--isolated-script-test-output",
|
| - "/path/to/tmp/json"
|
| + "--output-format",
|
| + "json",
|
| + "--output-dir",
|
| + "/path/to/tmp/"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "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@@@"
|
| - ]
|
| + "name": "gpu_process_launch_tests"
|
| },
|
| {
|
| + "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "[BUILD]/scripts/slave/runtest.py",
|
| + "--target",
|
| + "Release",
|
| + "--factory-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--build-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"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_new_test]",
|
| + "[dummy hash for telemetry_gpu_test]",
|
| "-I",
|
| "https://isolateserver.appspot.com",
|
| - "--verbose",
|
| "--",
|
| "gpu_rasterization",
|
| "--show-stdout",
|
| + "--output-format=gtest",
|
| "--browser=release",
|
| "-v",
|
| "--build-revision",
|
| @@ -652,18 +797,13 @@
|
| "--test-machine-name",
|
| "TestBuilder",
|
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --vmodule=startup_browser_creator=2",
|
| - "--isolated-script-test-output",
|
| - "/path/to/tmp/json"
|
| + "--output-format",
|
| + "json",
|
| + "--output-dir",
|
| + "/path/to/tmp/"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "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": "gpu_rasterization_tests"
|
| },
|
| {
|
| "allow_subannotations": true,
|
|
|