Revert "build: roll infra_paths changes"

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

Index: scripts/slave/recipes/v8.expected/full_client_dynamorio_linux_v8_dr.json
diff --git a/scripts/slave/recipes/v8.expected/full_client_dynamorio_linux_v8_dr.json b/scripts/slave/recipes/v8.expected/full_client_dynamorio_linux_v8_dr.json
index 847f6b6c3b52fec90ba5e220d0d7208404ad6e31..6b3fa5fe83a348b5890fd7c712abab540f3a8f42 100644
--- a/scripts/slave/recipes/v8.expected/full_client_dynamorio_linux_v8_dr.json
+++ b/scripts/slave/recipes/v8.expected/full_client_dynamorio_linux_v8_dr.json
@@ -11,13 +11,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'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'dynamorio', 'url': 'https://chromium.googlesource.com/external/dynamorio'}]",
+      "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'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'dynamorio', 'url': 'https://chromium.googlesource.com/external/dynamorio'}]",
       "--root",
       "v8",
       "--revision_mapping_file",
       "{\"v8\": \"got_revision\"}",
       "--git-cache-dir",
-      "[ROOT]/b/build/slave/cache_dir",
+      "[GIT_CACHE]",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -25,6 +25,7 @@
       "--no_shallow",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -63,9 +64,10 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "GYP_DEFINES": "clang=1 gomadir='[ROOT]/b/build/goma' target_arch=x64 use_goma=1 v8_target_arch=x64",
+      "GYP_DEFINES": "clang=1 gomadir='[BUILD]/goma' target_arch=x64 use_goma=1 v8_target_arch=x64",
       "GYP_GENERATORS": "ninja",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -80,6 +82,7 @@
       "python",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "cleanup_temp"
   },
   {
@@ -89,10 +92,11 @@
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
       "--src-dir",
-      "[CWD]/v8",
+      "[SLAVE_BUILD]/v8",
       "--output-json",
       "/path/to/tmp/json"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
@@ -119,9 +123,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",
@@ -131,9 +135,10 @@
       "--goma-service-account-json-file",
       "/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": "/creds/service_accounts/service-account-goma-client.json"
     },
@@ -148,9 +153,10 @@
       "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",
-      "[CWD]/dynamorio/build",
+      "[SLAVE_BUILD]/dynamorio/build",
       "511"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "makedirs Create Build Dir",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -171,7 +177,7 @@
       "..",
       "-DDEBUG=OFF"
     ],
-    "cwd": "[CWD]/dynamorio/build",
+    "cwd": "[SLAVE_BUILD]/dynamorio/build",
     "name": "Configure Release x64 DynamoRIO"
   },
   {
@@ -179,14 +185,14 @@
       "make",
       "-j5"
     ],
-    "cwd": "[CWD]/dynamorio/build",
+    "cwd": "[SLAVE_BUILD]/dynamorio/build",
     "name": "Compile Release x64 DynamoRIO"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/v8/tools/run-tests.py",
+      "[SLAVE_BUILD]/v8/tools/run-tests.py",
       "--progress=verbose",
       "--mode",
       "Release",
@@ -200,12 +206,12 @@
       "bot_default",
       "--exhaustive-variants",
       "--command_prefix",
-      "[CWD]/dynamorio/build/bin64/drrun -reset_every_nth_pending 0 --",
+      "[SLAVE_BUILD]/dynamorio/build/bin64/drrun -reset_every_nth_pending 0 --",
       "--rerun-failures-count=2",
       "--json-test-results",
       "/path/to/tmp/json"
     ],
-    "cwd": "[CWD]/v8",
+    "cwd": "[SLAVE_BUILD]/v8",
     "name": "Check",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",