| Index: scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Win_pass.json
 | 
| diff --git a/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Win_pass.json b/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Win_pass.json
 | 
| index 41fd3565289587f39c043db9eb090050eaf11ae3..945e0310cf729d88bc1049eeaa32492c66d8f58b 100644
 | 
| --- a/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Win_pass.json
 | 
| +++ b/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Win_pass.json
 | 
| @@ -3,6 +3,28 @@
 | 
|      "cmd": [
 | 
|        "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]\\V8_Blink_Win",
 | 
| +      "511"
 | 
| +    ],
 | 
| +    "name": "makedirs checkout path",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_LOG_LINE@python.inline@@@@",
 | 
| +      "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
 | 
| +      "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
 | 
| +      "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
 | 
| +      "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
 | 
| +      "@@@STEP_LOG_LINE@python.inline@  if os.path.exists(path):@@@",
 | 
| +      "@@@STEP_LOG_LINE@python.inline@    print \"%s exists but is not a dir\" % path@@@",
 | 
| +      "@@@STEP_LOG_LINE@python.inline@    sys.exit(1)@@@",
 | 
| +      "@@@STEP_LOG_LINE@python.inline@  os.makedirs(path, mode)@@@",
 | 
| +      "@@@STEP_LOG_END@python.inline@@@"
 | 
| +    ]
 | 
| +  },
 | 
| +  {
 | 
| +    "cmd": [
 | 
| +      "python",
 | 
| +      "-u",
 | 
|        "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
 | 
|        "--master",
 | 
|        "client.v8.fyi",
 | 
| @@ -27,6 +49,7 @@
 | 
|        "--force",
 | 
|        "--output_manifest"
 | 
|      ],
 | 
| +    "cwd": "[BUILDER_CACHE]\\V8_Blink_Win",
 | 
|      "env": {
 | 
|        "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
 | 
|      },
 | 
| @@ -108,17 +131,74 @@
 | 
|      ]
 | 
|    },
 | 
|    {
 | 
| +    "cmd": [],
 | 
| +    "cwd": "[BUILDER_CACHE]\\V8_Blink_Win",
 | 
| +    "name": "ensure_goma"
 | 
| +  },
 | 
| +  {
 | 
| +    "cmd": [
 | 
| +      "python",
 | 
| +      "-u",
 | 
| +      "RECIPE_MODULE[build::cipd]\\resources\\bootstrap.py",
 | 
| +      "--platform",
 | 
| +      "windows-386",
 | 
| +      "--dest-directory",
 | 
| +      "[SLAVE_BUILD]\\cipd",
 | 
| +      "--json-output",
 | 
| +      "/path/to/tmp/json"
 | 
| +    ],
 | 
| +    "cwd": "[BUILDER_CACHE]\\V8_Blink_Win",
 | 
| +    "name": "ensure_goma.install cipd",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@",
 | 
| +      "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
 | 
| +      "@@@STEP_LOG_LINE@json.output@{@@@",
 | 
| +      "@@@STEP_LOG_LINE@json.output@  \"executable\": \"[SLAVE_BUILD]\\\\cipd\\\\cipd\", @@@",
 | 
| +      "@@@STEP_LOG_LINE@json.output@  \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
 | 
| +      "@@@STEP_LOG_LINE@json.output@}@@@",
 | 
| +      "@@@STEP_LOG_END@json.output@@@"
 | 
| +    ]
 | 
| +  },
 | 
| +  {
 | 
| +    "cmd": [
 | 
| +      "[SLAVE_BUILD]\\cipd\\cipd",
 | 
| +      "ensure",
 | 
| +      "--root",
 | 
| +      "[CACHE]\\cipd\\goma",
 | 
| +      "--list",
 | 
| +      "infra_internal/goma/client/windows-amd64 release",
 | 
| +      "--json-output",
 | 
| +      "/path/to/tmp/json",
 | 
| +      "--service-account-json",
 | 
| +      "C:\\creds\\service_accounts\\service-account-goma-client.json"
 | 
| +    ],
 | 
| +    "cwd": "[BUILDER_CACHE]\\V8_Blink_Win",
 | 
| +    "name": "ensure_goma.ensure_installed",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@",
 | 
| +      "@@@STEP_LOG_LINE@json.output@{@@@",
 | 
| +      "@@@STEP_LOG_LINE@json.output@  \"result\": [@@@",
 | 
| +      "@@@STEP_LOG_LINE@json.output@    {@@@",
 | 
| +      "@@@STEP_LOG_LINE@json.output@      \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
 | 
| +      "@@@STEP_LOG_LINE@json.output@      \"package\": \"infra_internal/goma/client/windows-amd64\"@@@",
 | 
| +      "@@@STEP_LOG_LINE@json.output@    }@@@",
 | 
| +      "@@@STEP_LOG_LINE@json.output@  ]@@@",
 | 
| +      "@@@STEP_LOG_LINE@json.output@}@@@",
 | 
| +      "@@@STEP_LOG_END@json.output@@@"
 | 
| +    ]
 | 
| +  },
 | 
| +  {
 | 
|      "cmd": [
 | 
|        "python",
 | 
|        "-u",
 | 
|        "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
 | 
|        "runhooks"
 | 
|      ],
 | 
| -    "cwd": "[SLAVE_BUILD]\\src",
 | 
| +    "cwd": "[BUILDER_CACHE]\\V8_Blink_Win\\src",
 | 
|      "env": {
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
 | 
|        "GYP_CHROMIUM_NO_ACTION": "1",
 | 
| -      "GYP_DEFINES": "component=static_library fastbuild=1 gomadir='[BUILD]\\goma' target_arch=ia32 use_goma=1",
 | 
| +      "GYP_DEFINES": "component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=ia32 use_goma=1",
 | 
|        "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
 | 
|      },
 | 
|      "name": "gclient runhooks"
 | 
| @@ -127,19 +207,19 @@
 | 
|      "cmd": [
 | 
|        "python",
 | 
|        "-u",
 | 
| -      "[SLAVE_BUILD]\\src\\tools\\mb\\mb.py",
 | 
| +      "[BUILDER_CACHE]\\V8_Blink_Win\\src\\tools\\mb\\mb.py",
 | 
|        "gen",
 | 
|        "-m",
 | 
|        "client.v8.fyi",
 | 
|        "-b",
 | 
|        "V8-Blink Win",
 | 
|        "--config-file",
 | 
| -      "[SLAVE_BUILD]\\src\\tools\\mb\\mb_config.pyl",
 | 
| +      "[BUILDER_CACHE]\\V8_Blink_Win\\src\\tools\\mb\\mb_config.pyl",
 | 
|        "--goma-dir",
 | 
| -      "[BUILD]\\goma",
 | 
| +      "[CACHE]\\cipd\\goma",
 | 
|        "//out/Release"
 | 
|      ],
 | 
| -    "cwd": "[SLAVE_BUILD]\\src",
 | 
| +    "cwd": "[BUILDER_CACHE]\\V8_Blink_Win\\src",
 | 
|      "env": {
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
 | 
|      },
 | 
| @@ -160,9 +240,11 @@
 | 
|        "--target",
 | 
|        "Release",
 | 
|        "--src-dir",
 | 
| -      "[SLAVE_BUILD]\\src",
 | 
| +      "[BUILDER_CACHE]\\V8_Blink_Win\\src",
 | 
|        "--goma-cache-dir",
 | 
|        "[GOMA_CACHE]",
 | 
| +      "--goma-deps-cache-dir",
 | 
| +      "[GOMA_DEPS_CACHE]",
 | 
|        "--compiler",
 | 
|        "goma",
 | 
|        "--goma-jsonstatus",
 | 
| @@ -170,10 +252,11 @@
 | 
|        "--goma-service-account-json-file",
 | 
|        "C:\\creds\\service_accounts\\service-account-goma-client.json",
 | 
|        "--goma-dir",
 | 
| -      "[BUILD]\\goma",
 | 
| +      "[CACHE]\\cipd\\goma",
 | 
|        "--",
 | 
|        "blink_tests"
 | 
|      ],
 | 
| +    "cwd": "[BUILDER_CACHE]\\V8_Blink_Win",
 | 
|      "env": {
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
 | 
|      },
 | 
| @@ -191,28 +274,29 @@
 | 
|        "--target",
 | 
|        "Release",
 | 
|        "--factory-properties",
 | 
| -      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"V8-Blink Win\", \"buildnumber\": 571, \"mastername\": \"client.v8.fyi\", \"recipe\": \"blink_downstream\", \"revision\": \"20123\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
 | 
| +      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"V8-Blink Win\", \"buildnumber\": 571, \"mastername\": \"client.v8.fyi\", \"path_config\": \"kitchen\", \"recipe\": \"blink_downstream\", \"revision\": \"20123\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
 | 
|        "--build-properties",
 | 
| -      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"V8-Blink Win\", \"buildnumber\": 571, \"mastername\": \"client.v8.fyi\", \"recipe\": \"blink_downstream\", \"revision\": \"20123\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
 | 
| +      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"V8-Blink Win\", \"buildnumber\": 571, \"mastername\": \"client.v8.fyi\", \"path_config\": \"kitchen\", \"recipe\": \"blink_downstream\", \"revision\": \"20123\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
 | 
|        "--step-name=webkit_unit_tests",
 | 
|        "--builder-name=V8-Blink Win",
 | 
|        "--slave-name=TestSlavename",
 | 
|        "--build-number=571",
 | 
|        "webkit_unit_tests.exe"
 | 
|      ],
 | 
| +    "cwd": "[BUILDER_CACHE]\\V8_Blink_Win",
 | 
|      "name": "webkit_unit_tests"
 | 
|    },
 | 
|    {
 | 
|      "cmd": [
 | 
|        "python",
 | 
|        "-u",
 | 
| -      "[SLAVE_BUILD]\\src\\third_party\\WebKit\\Tools\\Scripts\\run-webkit-tests",
 | 
| +      "[BUILDER_CACHE]\\V8_Blink_Win\\src\\third_party\\WebKit\\Tools\\Scripts\\run-webkit-tests",
 | 
|        "--target",
 | 
|        "Release",
 | 
|        "--results-directory",
 | 
|        "[SLAVE_BUILD]\\layout-test-results",
 | 
|        "--build-dir",
 | 
| -      "[SLAVE_BUILD]\\src\\out",
 | 
| +      "[BUILDER_CACHE]\\V8_Blink_Win\\src\\out",
 | 
|        "--json-test-results",
 | 
|        "/path/to/tmp/json",
 | 
|        "--test-results-server",
 | 
| @@ -225,11 +309,12 @@
 | 
|        "webkit_tests (with patch)",
 | 
|        "--no-pixel-tests",
 | 
|        "--additional-expectations",
 | 
| -      "[SLAVE_BUILD]\\src\\v8\\tools\\blink_tests\\TestExpectations",
 | 
| +      "[BUILDER_CACHE]\\V8_Blink_Win\\src\\v8\\tools\\blink_tests\\TestExpectations",
 | 
|        "--master-name",
 | 
|        "client.v8.fyi",
 | 
|        "--debug-rwt-logging"
 | 
|      ],
 | 
| +    "cwd": "[BUILDER_CACHE]\\V8_Blink_Win",
 | 
|      "name": "webkit_tests (with patch)",
 | 
|      "~followup_annotations": [
 | 
|        "@@@STEP_TEXT@<br/>Total executed: 9001<br/>@@@"
 | 
| @@ -243,7 +328,7 @@
 | 
|        "--results-dir",
 | 
|        "[SLAVE_BUILD]\\layout-test-results",
 | 
|        "--build-dir",
 | 
| -      "[SLAVE_BUILD]\\src\\out",
 | 
| +      "[BUILDER_CACHE]\\V8_Blink_Win\\src\\out",
 | 
|        "--build-number",
 | 
|        "571",
 | 
|        "--builder-name",
 | 
| @@ -253,6 +338,7 @@
 | 
|        "--staging-dir",
 | 
|        "[CACHE]\\chrome_staging"
 | 
|      ],
 | 
| +    "cwd": "[BUILDER_CACHE]\\V8_Blink_Win",
 | 
|      "name": "archive_webkit_tests_results",
 | 
|      "~followup_annotations": [
 | 
|        "@@@STEP_LINK@layout_test_results@https://storage.googleapis.com/chromium-layout-test-archives/V8-Blink_Win/571/layout-test-results/results.html@@@",
 | 
| 
 |