Revert "Switch remaining bots to new Telemetry GPU isolate."

scripts/slave/recipes/gpu/build_and_test.expected/linux_debug_blink.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "[BUILD]/scripts/slave/cleanup_temp.py"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "cleanup temp"
   },
@@ skipping 132 matching lines @@
       "--goma-dir",
       "[BUILD]/goma",
       "--",
       "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"
+      "telemetry_gpu_test_run"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "compile",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
       "@@@STEP_LOG_END@json.output (invalid)@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[isolate]/resources/isolate.py",
       "[SLAVE_BUILD]/src/tools/swarming_client",
       "batcharchive",
       "--dump-json",
       "/path/to/tmp/json",
       "--isolate-server",
       "https://isolateserver.appspot.com",
       "[SLAVE_BUILD]/src/out/Debug/angle_unittests.isolated.gen.json",
       "[SLAVE_BUILD]/src/out/Debug/content_gl_tests.isolated.gen.json",
       "[SLAVE_BUILD]/src/out/Debug/gl_tests.isolated.gen.json",
       "[SLAVE_BUILD]/src/out/Debug/gl_unittests.isolated.gen.json",
       "[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",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"angle_unittests\": \"[dummy hash for angle_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"content_gl_tests\": \"[dummy hash for content_gl_tests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"gl_tests\": \"[dummy hash for gl_tests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"gl_unittests\": \"[dummy hash for gl_unittests]\", @@@",
       "@@@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]\"}@@@"
     ]
   },
   {
     "cmd": [
       "killall",
       "-9",
       "gnome-keyring-daemon"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "killall gnome-keyring-daemon"
@@ skipping 140 matching lines @@
       "[dummy hash for gl_unittests]",
       "-I",
       "https://isolateserver.appspot.com",
       "--",
       "--use-gpu-in-tests"
     ],
     "cwd": "[SLAVE_BUILD]",
     "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\": \"TestBranch\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"webkit\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"top_of_tree_blink\": true, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "--build-properties",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"webkit\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"top_of_tree_blink\": true, \"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=debug",
       "-v",
       "--build-revision",
       "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--test-machine-name",
       "TestBuilder",
       "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--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@@@"
-    ]
+    "env": {
+      "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
+    },
+    "name": "maps_pixel_test"
   },
   {
+    "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\": \"TestBranch\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"webkit\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"top_of_tree_blink\": true, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "--build-properties",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"webkit\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"top_of_tree_blink\": true, \"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=debug",
       "-v",
       "--build-revision",
       "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--upload-refimg-to-cloud-storage",
       "--refimg-cloud-storage-bucket",
       "chromium-gpu-archive/reference-images",
       "--os-type",
       "linux",
       "--test-machine-name",
       "TestBuilder",
       "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output",
-      "/path/to/tmp/json"
-    ],
-    "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@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[SLAVE_BUILD]/src/tools/swarming_client/run_isolated.py",
-      "--isolated",
-      "[dummy hash for telemetry_gpu_new_test]",
-      "-I",
-      "https://isolateserver.appspot.com",
-      "--verbose",
+      "--output-format",
+      "json",
+      "--output-dir",
+      "/path/to/tmp/"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "env": {
+      "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
+    },
+    "name": "pixel_test"
+  },
+  {
+    "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\": \"TestBranch\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"webkit\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"top_of_tree_blink\": true, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "--build-properties",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"webkit\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"top_of_tree_blink\": true, \"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]",
+      "-I",
+      "https://isolateserver.appspot.com",
       "--",
       "webgl_conformance",
       "--show-stdout",
-      "--browser=debug",
-      "-v",
-      "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output",
-      "/path/to/tmp/json"
-    ],
-    "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@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[SLAVE_BUILD]/src/tools/swarming_client/run_isolated.py",
-      "--isolated",
-      "[dummy hash for telemetry_gpu_new_test]",
-      "-I",
-      "https://isolateserver.appspot.com",
-      "--verbose",
+      "--output-format=gtest",
+      "--browser=debug",
+      "-v",
+      "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
+      "--output-format",
+      "json",
+      "--output-dir",
+      "/path/to/tmp/"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "env": {
+      "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
+    },
+    "name": "webgl_conformance_tests"
+  },
+  {
+    "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\": \"TestBranch\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"webkit\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"top_of_tree_blink\": true, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "--build-properties",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"webkit\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"top_of_tree_blink\": true, \"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]",
+      "-I",
+      "https://isolateserver.appspot.com",
       "--",
       "context_lost",
       "--show-stdout",
-      "--browser=debug",
-      "-v",
-      "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output",
-      "/path/to/tmp/json"
-    ],
-    "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@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[SLAVE_BUILD]/src/tools/swarming_client/run_isolated.py",
-      "--isolated",
-      "[dummy hash for telemetry_gpu_new_test]",
-      "-I",
-      "https://isolateserver.appspot.com",
-      "--verbose",
+      "--output-format=gtest",
+      "--browser=debug",
+      "-v",
+      "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
+      "--output-format",
+      "json",
+      "--output-dir",
+      "/path/to/tmp/"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "env": {
+      "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
+    },
+    "name": "context_lost_tests"
+  },
+  {
+    "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\": \"TestBranch\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"webkit\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"top_of_tree_blink\": true, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "--build-properties",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"webkit\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"top_of_tree_blink\": true, \"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]",
+      "-I",
+      "https://isolateserver.appspot.com",
       "--",
       "memory_test",
       "--show-stdout",
-      "--browser=debug",
-      "-v",
-      "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output",
-      "/path/to/tmp/json"
-    ],
-    "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@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[SLAVE_BUILD]/src/tools/swarming_client/run_isolated.py",
-      "--isolated",
-      "[dummy hash for telemetry_gpu_new_test]",
-      "-I",
-      "https://isolateserver.appspot.com",
-      "--verbose",
+      "--output-format=gtest",
+      "--browser=debug",
+      "-v",
+      "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
+      "--output-format",
+      "json",
+      "--output-dir",
+      "/path/to/tmp/"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "env": {
+      "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
+    },
+    "name": "memory_test"
+  },
+  {
+    "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\": \"TestBranch\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"webkit\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"top_of_tree_blink\": true, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "--build-properties",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"webkit\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"top_of_tree_blink\": true, \"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]",
+      "-I",
+      "https://isolateserver.appspot.com",
       "--",
       "trace_test",
       "--show-stdout",
-      "--browser=debug",
-      "-v",
-      "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output",
-      "/path/to/tmp/json"
-    ],
-    "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@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[SLAVE_BUILD]/src/tools/swarming_client/run_isolated.py",
-      "--isolated",
-      "[dummy hash for telemetry_gpu_new_test]",
-      "-I",
-      "https://isolateserver.appspot.com",
-      "--verbose",
+      "--output-format=gtest",
+      "--browser=debug",
+      "-v",
+      "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
+      "--output-format",
+      "json",
+      "--output-dir",
+      "/path/to/tmp/"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "env": {
+      "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
+    },
+    "name": "trace_test"
+  },
+  {
+    "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\": \"TestBranch\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"webkit\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"top_of_tree_blink\": true, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "--build-properties",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"webkit\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"top_of_tree_blink\": true, \"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]",
+      "-I",
+      "https://isolateserver.appspot.com",
       "--",
       "screenshot_sync",
       "--show-stdout",
-      "--browser=debug",
-      "-v",
-      "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output",
-      "/path/to/tmp/json"
-    ],
-    "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@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[SLAVE_BUILD]/src/tools/swarming_client/run_isolated.py",
-      "--isolated",
-      "[dummy hash for telemetry_gpu_new_test]",
-      "-I",
-      "https://isolateserver.appspot.com",
-      "--verbose",
+      "--output-format=gtest",
+      "--browser=debug",
+      "-v",
+      "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
+      "--output-format",
+      "json",
+      "--output-dir",
+      "/path/to/tmp/"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "env": {
+      "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
+    },
+    "name": "screenshot_sync_tests"
+  },
+  {
+    "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\": \"TestBranch\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"webkit\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"top_of_tree_blink\": true, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "--build-properties",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"webkit\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"top_of_tree_blink\": true, \"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]",
+      "-I",
+      "https://isolateserver.appspot.com",
       "--",
       "hardware_accelerated_feature",
       "--show-stdout",
-      "--browser=debug",
-      "-v",
-      "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output",
-      "/path/to/tmp/json"
-    ],
-    "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@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[SLAVE_BUILD]/src/tools/swarming_client/run_isolated.py",
-      "--isolated",
-      "[dummy hash for telemetry_gpu_new_test]",
-      "-I",
-      "https://isolateserver.appspot.com",
-      "--verbose",
+      "--output-format=gtest",
+      "--browser=debug",
+      "-v",
+      "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
+      "--output-format",
+      "json",
+      "--output-dir",
+      "/path/to/tmp/"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "env": {
+      "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
+    },
+    "name": "hardware_accelerated_feature_tests"
+  },
+  {
+    "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\": \"TestBranch\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"webkit\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"top_of_tree_blink\": true, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "--build-properties",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"webkit\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"top_of_tree_blink\": true, \"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]",
+      "-I",
+      "https://isolateserver.appspot.com",
       "--",
       "gpu_process",
       "--show-stdout",
-      "--browser=debug",
-      "-v",
-      "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output",
-      "/path/to/tmp/json"
-    ],
-    "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@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[SLAVE_BUILD]/src/tools/swarming_client/run_isolated.py",
-      "--isolated",
-      "[dummy hash for telemetry_gpu_new_test]",
-      "-I",
-      "https://isolateserver.appspot.com",
-      "--verbose",
+      "--output-format=gtest",
+      "--browser=debug",
+      "-v",
+      "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
+      "--output-format",
+      "json",
+      "--output-dir",
+      "/path/to/tmp/"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "env": {
+      "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
+    },
+    "name": "gpu_process_launch_tests"
+  },
+  {
+    "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\": \"TestBranch\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"webkit\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"top_of_tree_blink\": true, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "--build-properties",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"webkit\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"top_of_tree_blink\": true, \"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]",
+      "-I",
+      "https://isolateserver.appspot.com",
       "--",
       "gpu_rasterization",
       "--show-stdout",
+      "--output-format=gtest",
       "--browser=debug",
       "-v",
       "--build-revision",
       "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--test-machine-name",
       "TestBuilder",
       "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--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@@@"
-    ]
+    "env": {
+      "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
+    },
+    "name": "gpu_rasterization_tests"
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]