| Index: scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___noi18n___debug.json | 
| diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___noi18n___debug.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___noi18n___debug.json | 
| index b564872b79fbe4d5b827fbe5e823aa1d6133c07a..922ff750e1d1f64427f49ec52290aee71678c747 100644 | 
| --- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___noi18n___debug.json | 
| +++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___noi18n___debug.json | 
| @@ -11,13 +11,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", | 
| "--output_json", | 
| "/path/to/tmp/json", | 
| "--revision", | 
| @@ -25,7 +25,6 @@ | 
| "--no_shallow", | 
| "--output_manifest" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" | 
| }, | 
| @@ -64,10 +63,9 @@ | 
| "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='[BUILD]/goma' target_arch=ia32 use_goma=1 v8_enable_i18n_support=0 v8_enable_slow_dchecks=1 v8_optimized_debug=1 v8_target_arch=ia32", | 
| +      "GYP_DEFINES": "clang=1 gomadir='[ROOT]/b/build/goma' target_arch=ia32 use_goma=1 v8_enable_i18n_support=0 v8_enable_slow_dchecks=1 v8_optimized_debug=1 v8_target_arch=ia32", | 
| "GYP_GENERATORS": "ninja", | 
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" | 
| }, | 
| @@ -82,7 +80,6 @@ | 
| "python", | 
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "cleanup_temp" | 
| }, | 
| { | 
| @@ -92,11 +89,10 @@ | 
| "-u", | 
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py", | 
| "--src-dir", | 
| -      "[SLAVE_BUILD]/v8", | 
| +      "[CWD]/v8", | 
| "--output-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" | 
| }, | 
| @@ -123,9 +119,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", | 
| @@ -135,10 +131,9 @@ | 
| "--goma-service-account-json-file", | 
| "/creds/service_accounts/service-account-goma-client.json", | 
| "--goma-dir", | 
| -      "[BUILD]/goma", | 
| +      "[ROOT]/b/build/goma", | 
| "--" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" | 
| }, | 
| @@ -152,7 +147,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/v8/tools/run-tests.py", | 
| +      "[CWD]/v8/tools/run-tests.py", | 
| "--progress=verbose", | 
| "--mode", | 
| "Debug", | 
| @@ -169,7 +164,7 @@ | 
| "--json-test-results", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]/v8", | 
| +    "cwd": "[CWD]/v8", | 
| "name": "Check", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", | 
| @@ -192,7 +187,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/v8/tools/run-tests.py", | 
| +      "[CWD]/v8/tools/run-tests.py", | 
| "--progress=verbose", | 
| "--mode", | 
| "Debug", | 
| @@ -209,7 +204,7 @@ | 
| "--json-test-results", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]/v8", | 
| +    "cwd": "[CWD]/v8", | 
| "name": "Mozilla", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", | 
| @@ -232,7 +227,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/v8/tools/run-tests.py", | 
| +      "[CWD]/v8/tools/run-tests.py", | 
| "--progress=verbose", | 
| "--mode", | 
| "Debug", | 
| @@ -251,7 +246,7 @@ | 
| "--json-test-results", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]/v8", | 
| +    "cwd": "[CWD]/v8", | 
| "name": "Test262 - no variants", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", | 
| @@ -274,7 +269,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/v8/tools/run-tests.py", | 
| +      "[CWD]/v8/tools/run-tests.py", | 
| "--progress=verbose", | 
| "--mode", | 
| "Debug", | 
| @@ -292,7 +287,7 @@ | 
| "--json-test-results", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]/v8", | 
| +    "cwd": "[CWD]/v8", | 
| "name": "SimdJs - all", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", | 
|  |