| Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_layout_tests_slimming_paint_v2.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_blink_linux_blink_rel_pass.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_layout_tests_slimming_paint_v2.json
|
| similarity index 83%
|
| copy from scripts/slave/recipes/chromium_trybot.expected/full_tryserver_blink_linux_blink_rel_pass.json
|
| copy to scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_layout_tests_slimming_paint_v2.json
|
| index 1ce32eaa088c2366e1d8a0e25dc29a3f6f8e2fcd..25890a9e61e5a49866425778583c5c9c5eda2793 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_blink_linux_blink_rel_pass.json
|
| +++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_layout_tests_slimming_paint_v2.json
|
| @@ -4,7 +4,7 @@
|
| "python",
|
| "-u",
|
| "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| - "[BUILDER_CACHE]/linux_layout",
|
| + "[BUILDER_CACHE]/linux_layout_tests_slimming_paint_v2",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -27,9 +27,9 @@
|
| "-u",
|
| "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| "--master",
|
| - "tryserver.blink",
|
| + "tryserver.chromium.linux",
|
| "--builder",
|
| - "linux_blink_rel",
|
| + "linux_layout_tests_slimming_paint_v2",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| @@ -52,7 +52,7 @@
|
| "src@HEAD",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/linux_layout",
|
| + "cwd": "[BUILDER_CACHE]/linux_layout_tests_slimming_paint_v2",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -190,7 +190,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/linux_layout/src/tools/swarming_client/swarming.py",
|
| + "[BUILDER_CACHE]/linux_layout_tests_slimming_paint_v2/src/tools/swarming_client/swarming.py",
|
| "--version"
|
| ],
|
| "name": "swarming.py --version",
|
| @@ -206,7 +206,7 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/linux_layout/src",
|
| + "cwd": "[BUILDER_CACHE]/linux_layout_tests_slimming_paint_v2/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| @@ -219,16 +219,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/linux_layout/src/testing/scripts/get_compile_targets.py",
|
| + "[BUILDER_CACHE]/linux_layout_tests_slimming_paint_v2/src/testing/scripts/get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| "--build-config-fs",
|
| "Release",
|
| "--paths",
|
| - "{\"checkout\": \"[BUILDER_CACHE]/linux_layout/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| + "{\"checkout\": \"[BUILDER_CACHE]/linux_layout_tests_slimming_paint_v2/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| "--properties",
|
| - "{\"buildername\": \"linux_blink_rel\", \"buildnumber\": 571, \"mastername\": \"tryserver.blink\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
|
| + "{\"buildername\": \"linux_layout_tests_slimming_paint_v2\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
|
| ],
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| @@ -241,12 +241,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]/linux_layout/src/testing/buildbot/chromium.webkit.json",
|
| + "[BUILDER_CACHE]/linux_layout_tests_slimming_paint_v2/src/testing/buildbot/chromium.fyi.json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "name": "read test spec (chromium.webkit.json)",
|
| + "name": "read test spec (chromium.fyi.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]/linux_layout/src/testing/buildbot/chromium.webkit.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]/linux_layout_tests_slimming_paint_v2/src/testing/buildbot/chromium.fyi.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -258,7 +258,7 @@
|
| "--cached",
|
| "--name-only"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/linux_layout/src",
|
| + "cwd": "[BUILDER_CACHE]/linux_layout_tests_slimming_paint_v2/src",
|
| "name": "git diff to analyze patch",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -272,7 +272,7 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]/linux_layout/src/testing/buildbot/trybot_analyze_config.json",
|
| + "[BUILDER_CACHE]/linux_layout_tests_slimming_paint_v2/src/testing/buildbot/trybot_analyze_config.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read filter exclusion spec",
|
| @@ -335,19 +335,19 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/linux_layout/src/tools/mb/mb.py",
|
| + "[BUILDER_CACHE]/linux_layout_tests_slimming_paint_v2/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| - "tryserver.blink",
|
| + "tryserver.chromium.linux",
|
| "-b",
|
| - "linux_blink_rel",
|
| + "linux_layout_tests_slimming_paint_v2",
|
| "--config-file",
|
| - "[BUILDER_CACHE]/linux_layout/src/tools/mb/mb_config.pyl",
|
| + "[BUILDER_CACHE]/linux_layout_tests_slimming_paint_v2/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| "//out/Release"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/linux_layout/src",
|
| + "cwd": "[BUILDER_CACHE]/linux_layout_tests_slimming_paint_v2/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -368,7 +368,7 @@
|
| "--target",
|
| "Release",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/linux_layout/src",
|
| + "[BUILDER_CACHE]/linux_layout_tests_slimming_paint_v2/src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--goma-deps-cache-dir",
|
| @@ -413,11 +413,11 @@
|
| "Release",
|
| "--no-xvfb",
|
| "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_blink_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.blink\", \"patch_project\": \"chromium\", \"patchset\": 1, \"path_config\": \"kitchen\", \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {}, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_layout_tests_slimming_paint_v2\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.linux\", \"patch_project\": \"chromium\", \"patchset\": 1, \"path_config\": \"kitchen\", \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {}, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_blink_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.blink\", \"patch_project\": \"chromium\", \"patchset\": 1, \"path_config\": \"kitchen\", \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {}, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_layout_tests_slimming_paint_v2\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.linux\", \"patch_project\": \"chromium\", \"patchset\": 1, \"path_config\": \"kitchen\", \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {}, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--step-name=webkit_tests (with patch)",
|
| - "--builder-name=linux_blink_rel",
|
| + "--builder-name=linux_layout_tests_slimming_paint_v2",
|
| "--slave-name=TestSlavename",
|
| "--build-number=571",
|
| "--run-python-script",
|
| @@ -427,7 +427,7 @@
|
| "-o",
|
| "[SLAVE_BUILD]/layout-test-results",
|
| "--build-dir",
|
| - "[BUILDER_CACHE]/linux_layout/src/out",
|
| + "[BUILDER_CACHE]/linux_layout_tests_slimming_paint_v2/src/out",
|
| "--json-test-results",
|
| "/path/to/tmp/json",
|
| "--test-results-server",
|
| @@ -435,11 +435,12 @@
|
| "--build-number",
|
| "571",
|
| "--builder-name",
|
| - "linux_blink_rel",
|
| + "linux_layout_tests_slimming_paint_v2",
|
| "--step-name",
|
| - "webkit_tests (with patch)"
|
| + "webkit_tests (with patch)",
|
| + "--additional-driver-flag=--enable-slimming-paint-v2"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/linux_layout",
|
| + "cwd": "[BUILDER_CACHE]/linux_layout_tests_slimming_paint_v2",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -456,24 +457,24 @@
|
| "--results-dir",
|
| "[SLAVE_BUILD]/layout-test-results",
|
| "--build-dir",
|
| - "[BUILDER_CACHE]/linux_layout/src/out",
|
| + "[BUILDER_CACHE]/linux_layout_tests_slimming_paint_v2/src/out",
|
| "--build-number",
|
| "571",
|
| "--builder-name",
|
| - "linux_blink_rel",
|
| + "linux_layout_tests_slimming_paint_v2",
|
| "--gs-bucket",
|
| "gs://chromium-layout-test-archives",
|
| "--staging-dir",
|
| "[CACHE]/chrome_staging"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/linux_layout",
|
| + "cwd": "[BUILDER_CACHE]/linux_layout_tests_slimming_paint_v2",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| "name": "archive_webkit_tests_results",
|
| "~followup_annotations": [
|
| - "@@@STEP_LINK@layout_test_results@https://storage.googleapis.com/chromium-layout-test-archives/linux_blink_rel/571/layout-test-results/results.html@@@",
|
| - "@@@STEP_LINK@(zip)@https://storage.googleapis.com/chromium-layout-test-archives/linux_blink_rel/571/layout-test-results.zip@@@"
|
| + "@@@STEP_LINK@layout_test_results@https://storage.googleapis.com/chromium-layout-test-archives/linux_layout_tests_slimming_paint_v2/571/layout-test-results/results.html@@@",
|
| + "@@@STEP_LINK@(zip)@https://storage.googleapis.com/chromium-layout-test-archives/linux_layout_tests_slimming_paint_v2/571/layout-test-results.zip@@@"
|
| ]
|
| },
|
| {
|
|
|