| Index: scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_win_compile_dbg.json | 
| diff --git a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_win_compile_dbg.json b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_win_compile_dbg.json | 
| index 1df17f9de440136063b4144e3c2ce97c1061d6c3..42ccbf223d3d7d715aa166ce296edeb6e14e9757 100644 | 
| --- a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_win_compile_dbg.json | 
| +++ b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_win_compile_dbg.json | 
| @@ -5,7 +5,6 @@ | 
| "-u", | 
| "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "taskkill" | 
| }, | 
| { | 
| @@ -20,13 +19,13 @@ | 
| "--slave", | 
| "TestSlavename", | 
| "--spec", | 
| -      "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'}]", | 
| +      "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'}]", | 
| "--root", | 
| "v8", | 
| "--revision_mapping_file", | 
| "{\"v8\": \"got_revision\"}", | 
| "--git-cache-dir", | 
| -      "[GIT_CACHE]", | 
| +      "[ROOT]\\b\\build\\slave\\cache_dir", | 
| "--issue", | 
| "12853011", | 
| "--patchset", | 
| @@ -40,7 +39,6 @@ | 
| "--no_shallow", | 
| "--output_manifest" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" | 
| }, | 
| @@ -79,10 +77,9 @@ | 
| "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 dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]\\goma' target_arch=ia32 use_goma=1 v8_enable_slow_dchecks=1 v8_optimized_debug=1 v8_target_arch=ia32", | 
| +      "GYP_DEFINES": "chromium_win_pch=0 dcheck_always_on=1 fastbuild=1 gomadir='[ROOT]\\b\\build\\goma' target_arch=ia32 use_goma=1 v8_enable_slow_dchecks=1 v8_optimized_debug=1 v8_target_arch=ia32", | 
| "GYP_GENERATORS": "ninja", | 
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" | 
| }, | 
| @@ -97,7 +94,6 @@ | 
| "python", | 
| "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "cleanup_temp" | 
| }, | 
| { | 
| @@ -115,9 +111,9 @@ | 
| "--target", | 
| "Debug", | 
| "--src-dir", | 
| -      "[SLAVE_BUILD]\\v8", | 
| +      "[CWD]\\v8", | 
| "--goma-cache-dir", | 
| -      "[GOMA_CACHE]", | 
| +      "[ROOT]\\b\\build\\slave\\goma_cache", | 
| "--build-tool", | 
| "ninja", | 
| "--compiler", | 
| @@ -127,12 +123,11 @@ | 
| "--goma-service-account-json-file", | 
| "C:\\creds\\service_accounts\\service-account-goma-client.json", | 
| "--goma-dir", | 
| -      "[BUILD]\\goma", | 
| +      "[ROOT]\\b\\build\\goma", | 
| "--goma-fail-fast", | 
| "--goma-disable-local-fallback", | 
| "--" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json" | 
| }, | 
|  |