Index: scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___predictable_bisect_one_change.json |
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___predictable_bisect_one_change.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___predictable_bisect_one_change.json |
index f16a88ba8231197e548a9cf5414356544dd35c80..77109797e546785d84cd60834fdcc52a28c8e452 100644 |
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___predictable_bisect_one_change.json |
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___predictable_bisect_one_change.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_verify_predictable=1 v8_target_arch=ia32", |
+ "GYP_DEFINES": "clang=1 gomadir='[ROOT]/b/build/goma' target_arch=ia32 use_goma=1 v8_enable_verify_predictable=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", |
"Release", |
"--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", |
"Release", |
@@ -170,7 +165,7 @@ |
"--json-test-results", |
"/path/to/tmp/json" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[CWD]/v8", |
"name": "Mjsunit", |
"~followup_annotations": [ |
"@@@STEP_TEXT@failures: 2<br/>@@@", |
@@ -237,7 +232,7 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/v8/tools/run-tests.py", |
+ "[CWD]/v8/tools/run-tests.py", |
"--progress=verbose", |
"--mode", |
"Release", |
@@ -255,7 +250,7 @@ |
"--json-test-results", |
"/path/to/tmp/json" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[CWD]/v8", |
"name": "Webkit", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -278,7 +273,7 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/v8/tools/run-tests.py", |
+ "[CWD]/v8/tools/run-tests.py", |
"--progress=verbose", |
"--mode", |
"Release", |
@@ -297,7 +292,7 @@ |
"--json-test-results", |
"/path/to/tmp/json" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[CWD]/v8", |
"name": "Benchmarks", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -320,7 +315,7 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/v8/tools/run-tests.py", |
+ "[CWD]/v8/tools/run-tests.py", |
"--progress=verbose", |
"--mode", |
"Release", |
@@ -338,7 +333,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@@@", |
@@ -359,7 +354,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Bisect" |
}, |
{ |
@@ -371,7 +365,6 @@ |
"--outfile", |
"/path/to/tmp/json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Bisect.Fetch changes", |
"~followup_annotations": [ |
"@@@STEP_NEST_LEVEL@1@@@", |
@@ -399,7 +392,6 @@ |
"--log-limit", |
"100" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Bisect.Get change range", |
"~followup_annotations": [ |
"@@@STEP_NEST_LEVEL@1@@@", |
@@ -421,7 +413,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Bisect.disabled - less than two changes", |
"~followup_annotations": [ |
"@@@STEP_NEST_LEVEL@1@@@" |