Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Unified Diff: scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Mac_fail.json

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Mac_fail.json
diff --git a/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Mac_fail.json b/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Mac_fail.json
index 930e93288d4354a98ca773b632eefd7731296c7b..2e33341a2ed3d20402841a29156757ac4fc0b07d 100644
--- a/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Mac_fail.json
+++ b/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Mac_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": "clang=1 component=static_library gomadir='[ROOT]/b/build/goma' target_arch=x64 use_goma=1",
+ "GYP_DEFINES": "clang=1 component=static_library gomadir='[BUILD]/goma' target_arch=x64 use_goma=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -120,10 +122,11 @@
"-u",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
"--src-dir",
- "[CWD]/src",
+ "[SLAVE_BUILD]/src",
"--output-json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -150,9 +153,9 @@
"--target",
"Release",
"--src-dir",
- "[CWD]/src",
+ "[SLAVE_BUILD]/src",
"--goma-cache-dir",
- "[ROOT]/b/build/slave/goma_cache",
+ "[GOMA_CACHE]",
"--build-tool",
"ninja",
"--compiler",
@@ -162,10 +165,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"
},
@@ -192,6 +196,7 @@
"--build-number=571",
"webkit_unit_tests"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "webkit_unit_tests"
},
{
@@ -210,13 +215,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",
"Release",
"-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",
@@ -229,8 +234,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",
@@ -242,11 +248,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",
@@ -254,6 +260,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_Mac/571/layout-test-results/results.html@@@",
@@ -272,13 +279,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",
@@ -286,6 +293,7 @@
"--force",
"--output_manifest"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -352,9 +360,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": "clang=1 component=static_library gomadir='[ROOT]/b/build/goma' target_arch=x64 use_goma=1",
+ "GYP_DEFINES": "clang=1 component=static_library gomadir='[BUILD]/goma' target_arch=x64 use_goma=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks (2)"
@@ -366,10 +375,11 @@
"-u",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
"--src-dir",
- "[CWD]/src",
+ "[SLAVE_BUILD]/src",
"--output-json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -396,9 +406,9 @@
"--target",
"Release",
"--src-dir",
- "[CWD]/src",
+ "[SLAVE_BUILD]/src",
"--goma-cache-dir",
- "[ROOT]/b/build/slave/goma_cache",
+ "[GOMA_CACHE]",
"--build-tool",
"ninja",
"--compiler",
@@ -408,10 +418,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"
},
@@ -437,13 +448,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",
"Release",
"-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",
@@ -456,12 +467,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",
@@ -475,6 +487,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/>@@@",

Powered by Google App Engine
This is Rietveld 408576698