| Index: scripts/slave/recipes/v8.expected/full_client_v8_V8_Win64___clang.json
|
| diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Win64___clang.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Win64___clang.json
|
| index 4db9b9123b2d152340c5e1b60c1f1f2435c22860..a242955a642fe8500bba65c70d815a32bcd4cc25 100644
|
| --- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Win64___clang.json
|
| +++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Win64___clang.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",
|
| "--output_json",
|
| "/path/to/tmp/json",
|
| "--revision",
|
| @@ -34,7 +33,6 @@
|
| "--no_shallow",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -73,10 +71,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": "clang=1 gomadir='[BUILD]\\goma' target_arch=x64 use_goma=1 v8_target_arch=x64",
|
| + "GYP_DEFINES": "clang=1 gomadir='[ROOT]\\b\\build\\goma' target_arch=x64 use_goma=1 v8_target_arch=x64",
|
| "GYP_GENERATORS": "ninja",
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -91,7 +88,6 @@
|
| "python",
|
| "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "cleanup_temp"
|
| },
|
| {
|
| @@ -101,11 +97,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": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -132,9 +127,9 @@
|
| "--target",
|
| "Release_x64",
|
| "--src-dir",
|
| - "[SLAVE_BUILD]\\v8",
|
| + "[CWD]\\v8",
|
| "--goma-cache-dir",
|
| - "[GOMA_CACHE]",
|
| + "[ROOT]\\b\\build\\slave\\goma_cache",
|
| "--build-tool",
|
| "ninja",
|
| "--compiler",
|
| @@ -144,12 +139,11 @@
|
| "--goma-service-account-json-file",
|
| "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| "--goma-dir",
|
| - "[BUILD]\\goma",
|
| + "[ROOT]\\b\\build\\goma",
|
| "--arch",
|
| "x64",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
|
|