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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic.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
« no previous file with comments | « scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Linux_deterministic.json ('k') | scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Windows_Clang_deterministic.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic.json
diff --git a/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic.json b/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic.json
index 33b66f0796f287858265a79fa41361a887d37c60..a514053dd70a491bae5ad363139f509c28c3421d 100644
--- a/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic.json
+++ b/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic.json
@@ -8,6 +8,7 @@
"python",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -22,13 +23,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_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_v8_revision\"}",
"--git-cache-dir",
- "[ROOT]/b/build/slave/cache_dir",
+ "[GIT_CACHE]",
"--output_json",
"/path/to/tmp/json",
"--revision",
@@ -36,6 +37,7 @@
"--force",
"--output_manifest"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -114,9 +116,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=ia32 test_isolation_mode=prepare use_goma=1",
+ "GYP_DEFINES": "clang=1 component=static_library gomadir='[BUILD]/goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -128,10 +131,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"
},
@@ -158,9 +162,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",
@@ -170,11 +174,12 @@
"--goma-service-account-json-file",
"/creds/service_accounts/service-account-goma-client.json",
"--goma-dir",
- "[ROOT]/b/build/goma",
+ "[BUILD]/goma",
"--clobber",
"--",
"all"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -190,11 +195,11 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/remove_build_metadata.py",
"--build-dir",
- "[CWD]/src/out/Release",
+ "[SLAVE_BUILD]/src/out/Release",
"--src-dir",
- "[CWD]/src"
+ "[SLAVE_BUILD]/src"
],
- "cwd": "[CWD]",
+ "cwd": "[SLAVE_BUILD]",
"name": "remove_build_metadata",
"~followup_annotations": [
"step returned non-zero exit code: 1",
@@ -207,8 +212,9 @@
"-u",
"\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n f.write('\\n'.join(glob.glob(sys.argv[2])))\n",
"/path/to/tmp/",
- "[CWD]/src/out/Release/*.isolated.gen.json"
+ "[SLAVE_BUILD]/src/out/Release/*.isolated.gen.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "find isolated targets"
},
{
@@ -216,15 +222,16 @@
"python",
"-u",
"RECIPE_MODULE[build::isolate]/resources/isolate.py",
- "[CWD]/src/tools/swarming_client",
+ "[SLAVE_BUILD]/src/tools/swarming_client",
"batcharchive",
"--dump-json",
"/path/to/tmp/json",
"--isolate-server",
"https://isolateserver.appspot.com",
- "[CWD]/src/out/Release/dummy_target_1.isolated.gen.json",
- "[CWD]/src/out/Release/dummy_target_2.isolated.gen.json"
+ "[SLAVE_BUILD]/src/out/Release/dummy_target_1.isolated.gen.json",
+ "[SLAVE_BUILD]/src/out/Release/dummy_target_2.isolated.gen.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "isolate tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -240,10 +247,11 @@
"python",
"-u",
"\nimport os\nimport shutil\nimport sys\nif os.path.exists(sys.argv[2]):\n shutil.rmtree(sys.argv[2])\nshutil.move(sys.argv[1], sys.argv[2])",
- "[CWD]/src/out/Release",
- "[CWD]/src/out/Release.1"
+ "[SLAVE_BUILD]/src/out/Release",
+ "[SLAVE_BUILD]/src/out/Release.1"
],
- "name": "Move [CWD]/src/out/Release to [CWD]/src/out/Release.1",
+ "cwd": "[SLAVE_BUILD]",
+ "name": "Move [SLAVE_BUILD]/src/out/Release to [SLAVE_BUILD]/src/out/Release.1",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import os@@@",
@@ -262,9 +270,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=ia32 test_isolation_mode=prepare use_goma=1",
+ "GYP_DEFINES": "clang=1 component=static_library gomadir='[BUILD]/goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks (2)"
@@ -276,10 +285,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"
},
@@ -306,9 +316,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",
@@ -318,11 +328,12 @@
"--goma-service-account-json-file",
"/creds/service_accounts/service-account-goma-client.json",
"--goma-dir",
- "[ROOT]/b/build/goma",
+ "[BUILD]/goma",
"--clobber",
"--",
"all"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -338,11 +349,11 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/remove_build_metadata.py",
"--build-dir",
- "[CWD]/src/out/Release",
+ "[SLAVE_BUILD]/src/out/Release",
"--src-dir",
- "[CWD]/src"
+ "[SLAVE_BUILD]/src"
],
- "cwd": "[CWD]",
+ "cwd": "[SLAVE_BUILD]",
"name": "remove_build_metadata (2)"
},
{
@@ -351,8 +362,9 @@
"-u",
"\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n f.write('\\n'.join(glob.glob(sys.argv[2])))\n",
"/path/to/tmp/",
- "[CWD]/src/out/Release/*.isolated.gen.json"
+ "[SLAVE_BUILD]/src/out/Release/*.isolated.gen.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "find isolated targets (2)"
},
{
@@ -360,15 +372,16 @@
"python",
"-u",
"RECIPE_MODULE[build::isolate]/resources/isolate.py",
- "[CWD]/src/tools/swarming_client",
+ "[SLAVE_BUILD]/src/tools/swarming_client",
"batcharchive",
"--dump-json",
"/path/to/tmp/json",
"--isolate-server",
"https://isolateserver.appspot.com",
- "[CWD]/src/out/Release/dummy_target_1.isolated.gen.json",
- "[CWD]/src/out/Release/dummy_target_2.isolated.gen.json"
+ "[SLAVE_BUILD]/src/out/Release/dummy_target_1.isolated.gen.json",
+ "[SLAVE_BUILD]/src/out/Release/dummy_target_2.isolated.gen.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "isolate tests (2)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -384,10 +397,11 @@
"python",
"-u",
"\nimport os\nimport shutil\nimport sys\nif os.path.exists(sys.argv[2]):\n shutil.rmtree(sys.argv[2])\nshutil.move(sys.argv[1], sys.argv[2])",
- "[CWD]/src/out/Release",
- "[CWD]/src/out/Release.2"
+ "[SLAVE_BUILD]/src/out/Release",
+ "[SLAVE_BUILD]/src/out/Release.2"
],
- "name": "Move [CWD]/src/out/Release to [CWD]/src/out/Release.2",
+ "cwd": "[SLAVE_BUILD]",
+ "name": "Move [SLAVE_BUILD]/src/out/Release to [SLAVE_BUILD]/src/out/Release.2",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import os@@@",
@@ -405,13 +419,13 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/compare_build_artifacts.py",
"--first-build-dir",
- "[CWD]/src/out/Release.1",
+ "[SLAVE_BUILD]/src/out/Release.1",
"--second-build-dir",
- "[CWD]/src/out/Release.2",
+ "[SLAVE_BUILD]/src/out/Release.2",
"--target-platform",
"mac"
],
- "cwd": "[CWD]",
+ "cwd": "[SLAVE_BUILD]",
"name": "compare_build_artifacts"
},
{
« no previous file with comments | « scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Linux_deterministic.json ('k') | scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Windows_Clang_deterministic.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698