Revert "build: roll infra_paths changes"

scripts/slave/recipes/v8.expected/full_client_v8_V8_Win32___builder.json

Index: scripts/slave/recipes/v8.expected/full_client_v8_V8_Win32___builder.json
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Win32___builder.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Win32___builder.json
index ab866bb83e58a7c27bbe761693dfa050c602f233..b31cfe842318390786a36182c31a34100a45fdce 100644
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Win32___builder.json
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Win32___builder.json
@@ -5,6 +5,7 @@
       "-u",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "taskkill"
   },
   {
@@ -19,13 +20,13 @@
       "--slave",
       "TestSlavename",
       "--spec",
-      "cache_dir = '[ROOT]\\\\b\\\\build\\\\slave\\\\cache_dir'\nsolutions = [{'custom_vars': {'chromium_trunk': 'svn://svn-mirror.golo.chromium.org/chrome/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'v8', 'url': 'https://chromium.googlesource.com/v8/v8'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'chromium_trunk': 'svn://svn-mirror.golo.chromium.org/chrome/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'v8', 'url': 'https://chromium.googlesource.com/v8/v8'}]",
       "--root",
       "v8",
       "--revision_mapping_file",
       "{\"v8\": \"got_revision\", \"v8/tools/swarming_client\": \"got_swarming_client_revision\"}",
       "--git-cache-dir",
-      "[ROOT]\\b\\build\\slave\\cache_dir",
+      "[GIT_CACHE]",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -33,6 +34,7 @@
       "--no_shallow",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -76,9 +78,10 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]\\v8\\tools\\swarming_client\\swarming.py",
+      "[SLAVE_BUILD]\\v8\\tools\\swarming_client\\swarming.py",
       "--version"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "swarming.py --version",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -92,9 +95,10 @@
       "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
       "runhooks"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
-      "GYP_DEFINES": "chromium_win_pch=0 fastbuild=1 gomadir='[ROOT]\\b\\build\\goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1 v8_target_arch=ia32",
+      "GYP_DEFINES": "chromium_win_pch=0 fastbuild=1 gomadir='[BUILD]\\goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1 v8_target_arch=ia32",
       "GYP_GENERATORS": "ninja",
       "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -109,6 +113,7 @@
       "python",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "cleanup_temp"
   },
   {
@@ -126,9 +131,9 @@
       "--target",
       "Release",
       "--src-dir",
-      "[CWD]\\v8",
+      "[SLAVE_BUILD]\\v8",
       "--goma-cache-dir",
-      "[ROOT]\\b\\build\\slave\\goma_cache",
+      "[GOMA_CACHE]",
       "--build-tool",
       "ninja",
       "--compiler",
@@ -138,9 +143,10 @@
       "--goma-service-account-json-file",
       "C:\\creds\\service_accounts\\service-account-goma-client.json",
       "--goma-dir",
-      "[ROOT]\\b\\build\\goma",
+      "[BUILD]\\goma",
       "--"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
     },
@@ -155,18 +161,19 @@
       "python",
       "-u",
       "RECIPE_MODULE[build::isolate]\\resources\\isolate.py",
-      "[CWD]\\v8\\tools\\swarming_client",
+      "[SLAVE_BUILD]\\v8\\tools\\swarming_client",
       "batcharchive",
       "--dump-json",
       "/path/to/tmp/json",
       "--isolate-server",
       "https://isolateserver.appspot.com",
       "--verbose",
-      "[CWD]\\v8\\out\\Release\\bot_default.isolated.gen.json",
-      "[CWD]\\v8\\out\\Release\\ignition.isolated.gen.json",
-      "[CWD]\\v8\\out\\Release\\mozilla.isolated.gen.json",
-      "[CWD]\\v8\\out\\Release\\test262.isolated.gen.json"
+      "[SLAVE_BUILD]\\v8\\out\\Release\\bot_default.isolated.gen.json",
+      "[SLAVE_BUILD]\\v8\\out\\Release\\ignition.isolated.gen.json",
+      "[SLAVE_BUILD]\\v8\\out\\Release\\mozilla.isolated.gen.json",
+      "[SLAVE_BUILD]\\v8\\out\\Release\\test262.isolated.gen.json"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "isolate tests",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -184,7 +191,7 @@
       "-u",
       "RECIPE_MODULE[build::gsutil]\\resources\\gsutil_wrapper.py",
       "--",
-      "[ROOT]\\b\\depot_tools\\gsutil.py",
+      "[DEPOT_TOOLS]\\gsutil.py",
       "----",
       "cp",
       "-a",
@@ -192,6 +199,7 @@
       "{\"bot_default\": \"[dummy hash for bot_default]\", \"ignition\": \"[dummy hash for ignition]\", \"mozilla\": \"[dummy hash for mozilla]\", \"test262\": \"[dummy hash for test262]\"}",
       "gs://chromium-v8/v8-win32-rel/full-build-win32_f2cbea7e89a45f46819777bb78a1f5bd0241f64c.json"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "gsutil upload",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-v8/v8-win32-rel/full-build-win32_f2cbea7e89a45f46819777bb78a1f5bd0241f64c.json@@@"
@@ -217,10 +225,12 @@
       "--build-properties",
       "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"master\", \"buildername\": \"V8 Win32 - builder\", \"buildnumber\": 571, \"mastername\": \"client.v8\", \"parent_buildername\": null, \"recipe\": \"v8\", \"revision\": \"20123\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "package build"
   },
   {
     "cmd": [],
+    "cwd": "[SLAVE_BUILD]",
     "name": "trigger",
     "trigger_specs": [
       {