Index: scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64__dbg__fail.json |
diff --git a/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64__dbg__fail.json b/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64__dbg__fail.json |
index e2015df374a5dafde273455b4919ff270e877284..e8a174dad50158666da0e552693fddc4bcf094db 100644 |
--- a/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64__dbg__fail.json |
+++ b/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64__dbg__fail.json |
@@ -11,13 +11,13 @@ |
"--slave", |
"TestSlavename", |
"--spec", |
- "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]", |
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]", |
"--root", |
"src", |
"--revision_mapping_file", |
"{\"src\": \"got_cr_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_revision\"}", |
"--git-cache-dir", |
- "[ROOT]/b/build/slave/cache_dir", |
+ "[GIT_CACHE]", |
"--output_json", |
"/path/to/tmp/json", |
"--revision", |
@@ -27,6 +27,7 @@ |
"--force", |
"--output_manifest" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -106,9 +107,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": "component=shared_library gomadir='[ROOT]/b/build/goma' target_arch=x64 use_goma=1 v8_enable_slow_dchecks=1 v8_optimized_debug=1", |
+ "GYP_DEFINES": "component=shared_library gomadir='[BUILD]/goma' target_arch=x64 use_goma=1 v8_enable_slow_dchecks=1 v8_optimized_debug=1", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
"name": "gclient runhooks" |
@@ -128,9 +130,9 @@ |
"--target", |
"Debug", |
"--src-dir", |
- "[CWD]/src", |
+ "[SLAVE_BUILD]/src", |
"--goma-cache-dir", |
- "[ROOT]/b/build/slave/goma_cache", |
+ "[GOMA_CACHE]", |
"--build-tool", |
"ninja", |
"--compiler", |
@@ -140,10 +142,11 @@ |
"--goma-service-account-json-file", |
"/creds/service_accounts/service-account-goma-client.json", |
"--goma-dir", |
- "[ROOT]/b/build/goma", |
+ "[BUILD]/goma", |
"--", |
"blink_tests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |
@@ -171,6 +174,7 @@ |
"--build-number=571", |
"webkit_unit_tests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "webkit_unit_tests" |
}, |
{ |
@@ -190,13 +194,13 @@ |
"--slave-name=TestSlavename", |
"--build-number=571", |
"--run-python-script", |
- "[ROOT]/b/build/scripts/slave/chromium/layout_test_wrapper.py", |
+ "[BUILD]/scripts/slave/chromium/layout_test_wrapper.py", |
"--target", |
"Debug", |
"-o", |
- "[CWD]/layout-test-results", |
+ "[SLAVE_BUILD]/layout-test-results", |
"--build-dir", |
- "[CWD]/src/out", |
+ "[SLAVE_BUILD]/src/out", |
"--json-test-results", |
"/path/to/tmp/json", |
"--test-results-server", |
@@ -209,8 +213,9 @@ |
"webkit_tests (with patch)", |
"--no-pixel-tests", |
"--additional-expectations", |
- "[CWD]/src/v8/tools/blink_tests/TestExpectations" |
+ "[SLAVE_BUILD]/src/v8/tools/blink_tests/TestExpectations" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "webkit_tests (with patch)", |
"~followup_annotations": [ |
"step returned non-zero exit code: 5", |
@@ -222,11 +227,11 @@ |
"cmd": [ |
"python", |
"-u", |
- "[ROOT]/b/build/scripts/slave/chromium/archive_layout_test_results.py", |
+ "[BUILD]/scripts/slave/chromium/archive_layout_test_results.py", |
"--results-dir", |
- "[CWD]/layout-test-results", |
+ "[SLAVE_BUILD]/layout-test-results", |
"--build-dir", |
- "[CWD]/src/out", |
+ "[SLAVE_BUILD]/src/out", |
"--build-number", |
"571", |
"--builder-name", |
@@ -234,6 +239,7 @@ |
"--gs-bucket", |
"gs://chromium-layout-test-archives" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "archive_webkit_tests_results", |
"~followup_annotations": [ |
"@@@STEP_LINK@layout_test_results@https://storage.googleapis.com/chromium-layout-test-archives/V8-Blink_Linux_64__dbg_/571/layout-test-results/results.html@@@", |
@@ -252,13 +258,13 @@ |
"--slave", |
"TestSlavename", |
"--spec", |
- "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]", |
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]", |
"--root", |
"src", |
"--revision_mapping_file", |
"{\"src\": \"got_cr_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_revision\"}", |
"--git-cache-dir", |
- "[ROOT]/b/build/slave/cache_dir", |
+ "[GIT_CACHE]", |
"--output_json", |
"/path/to/tmp/json", |
"--revision", |
@@ -266,6 +272,7 @@ |
"--force", |
"--output_manifest" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -332,9 +339,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": "component=shared_library gomadir='[ROOT]/b/build/goma' target_arch=x64 use_goma=1 v8_enable_slow_dchecks=1 v8_optimized_debug=1", |
+ "GYP_DEFINES": "component=shared_library gomadir='[BUILD]/goma' target_arch=x64 use_goma=1 v8_enable_slow_dchecks=1 v8_optimized_debug=1", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
"name": "gclient runhooks (2)" |
@@ -354,9 +362,9 @@ |
"--target", |
"Debug", |
"--src-dir", |
- "[CWD]/src", |
+ "[SLAVE_BUILD]/src", |
"--goma-cache-dir", |
- "[ROOT]/b/build/slave/goma_cache", |
+ "[GOMA_CACHE]", |
"--build-tool", |
"ninja", |
"--compiler", |
@@ -366,10 +374,11 @@ |
"--goma-service-account-json-file", |
"/creds/service_accounts/service-account-goma-client.json", |
"--goma-dir", |
- "[ROOT]/b/build/goma", |
+ "[BUILD]/goma", |
"--", |
"blink_tests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |
@@ -396,13 +405,13 @@ |
"--slave-name=TestSlavename", |
"--build-number=571", |
"--run-python-script", |
- "[ROOT]/b/build/scripts/slave/chromium/layout_test_wrapper.py", |
+ "[BUILD]/scripts/slave/chromium/layout_test_wrapper.py", |
"--target", |
"Debug", |
"-o", |
- "[CWD]/layout-test-results", |
+ "[SLAVE_BUILD]/layout-test-results", |
"--build-dir", |
- "[CWD]/src/out", |
+ "[SLAVE_BUILD]/src/out", |
"--json-test-results", |
"/path/to/tmp/json", |
"--test-results-server", |
@@ -415,12 +424,13 @@ |
"webkit_tests (without patch)", |
"--no-pixel-tests", |
"--additional-expectations", |
- "[CWD]/src/v8/tools/blink_tests/TestExpectations", |
+ "[SLAVE_BUILD]/src/v8/tools/blink_tests/TestExpectations", |
"--test-list", |
"bad/totally-bad-probably.html\ntricky/totally-maybe-not-awesome.html", |
"--skipped", |
"always" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "webkit_tests (without patch)", |
"~followup_annotations": [ |
"step returned non-zero exit code: 5", |
@@ -434,6 +444,7 @@ |
"-u", |
"import sys; sys.exit(0)" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "webkit_tests (retry summary)", |
"~followup_annotations": [ |
"@@@STEP_TEXT@<br/>ignored:<br/>bad/totally-bad-probably.html<br/>tricky/totally-maybe-not-awesome.html<br/>@@@", |