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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/webrtc/ios.expected/basic.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/webrtc/ios.py ('k') | scripts/slave/recipes/webrtc/ios.expected/gn_build.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/webrtc/ios.expected/basic.json
diff --git a/scripts/slave/recipes/webrtc/ios.expected/basic.json b/scripts/slave/recipes/webrtc/ios.expected/basic.json
index fd94df2e850112e067a49ec9e368851b4685f809..5c116ceda4055571ea84065f9cfe644b6888d5dd 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/basic.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/basic.json
@@ -5,6 +5,7 @@
"--json-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "host and tools info",
"~followup_annotations": [
"@@@STEP_TEXT@<br />OS X 1.2.3, Xcode 6.7.8 (5D342509a)@@@",
@@ -33,19 +34,20 @@
"--slave",
"fake-vm",
"--spec",
- "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/webrtc'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'https://chrome-internal.googlesource.com/chrome/deps/webrtc-limited'}]\ntarget_os = ['ios', 'mac']",
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/webrtc'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'https://chrome-internal.googlesource.com/chrome/deps/webrtc-limited'}]\ntarget_os = ['ios', 'mac']",
"--root",
"src",
"--revision_mapping_file",
"{\"src\": \"got_revision\"}",
"--git-cache-dir",
- "[ROOT]/b/build/slave/cache_dir",
+ "[GIT_CACHE]",
"--output_json",
"/path/to/tmp/json",
"--revision",
"src@HEAD",
"--output_manifest"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -63,9 +65,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[CWD]/src/webrtc/build/ios/chromium.fake/ios_debug.json",
+ "[SLAVE_BUILD]/src/webrtc/build/ios/chromium.fake/ios_debug.json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "read build config",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -100,6 +103,7 @@
"-e",
"{\n \"GYP_DEFINES\": {\n \"OS\": \"ios\", \n \"component\": \"static_library\", \n \"fake gyp define 1\": \"fake value 1\", \n \"fake gyp define 2\": \"fake value 2\", \n \"use_goma\": \"1\"\n }, \n \"additional_compile_targets\": [\n \"All\"\n ], \n \"compiler\": \"ninja\", \n \"configuration\": \"Debug\", \n \"env\": {}, \n \"gn_args\": [], \n \"mb_type\": null, \n \"sdk\": \"iphonesimulator8.0\", \n \"tests\": [\n {\n \"app\": \"fake tests 1\", \n \"device type\": \"fake device\", \n \"os\": \"8.0\"\n }, \n {\n \"app\": \"fake tests 2\", \n \"device type\": \"fake device\", \n \"os\": \"7.1\"\n }\n ], \n \"triggered bots\": {}, \n \"use_analyze\": true, \n \"xcode version\": \"fake xcode version\"\n}"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "finalize build config"
},
{
@@ -110,6 +114,7 @@
"--version",
"fake xcode version"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "find xcode",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{}@@@",
@@ -123,6 +128,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GYP_CROSSCOMPILE": "1",
"GYP_DEFINES": "use_goma=1 fake gyp define 1=fake value 1 fake gyp define 2=fake value 2 component=static_library OS=ios",
@@ -142,10 +148,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"
},
@@ -172,9 +179,9 @@
"--target",
"Debug-iphonesimulator",
"--src-dir",
- "[CWD]/src",
+ "[SLAVE_BUILD]/src",
"--goma-cache-dir",
- "[ROOT]/b/build/slave/goma_cache",
+ "[GOMA_CACHE]",
"--build-tool",
"ninja",
"--compiler",
@@ -184,11 +191,11 @@
"--goma-service-account-json-file",
"/creds/service_accounts/service-account-goma-client.json",
"--goma-dir",
- "[ROOT]/b/build/goma",
+ "[BUILD]/goma",
"--",
"All"
],
- "cwd": "[CWD]/src/out/Debug-iphonesimulator",
+ "cwd": "[SLAVE_BUILD]/src/out/Debug-iphonesimulator",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -202,16 +209,17 @@
"cmd": [
"RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/run.py",
"--app",
- "[CWD]/src/out/Debug-iphonesimulator/fake tests 1.app",
+ "[SLAVE_BUILD]/src/out/Debug-iphonesimulator/fake tests 1.app",
"--json_file",
"/path/to/tmp/json",
"--iossim",
- "[CWD]/src/out/Debug-iphonesimulator/iossim",
+ "[SLAVE_BUILD]/src/out/Debug-iphonesimulator/iossim",
"--platform",
"fake device",
"--version",
"8.0"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "fake tests 1 (fake device iOS 8.0)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -236,16 +244,17 @@
"cmd": [
"RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/run.py",
"--app",
- "[CWD]/src/out/Debug-iphonesimulator/fake tests 2.app",
+ "[SLAVE_BUILD]/src/out/Debug-iphonesimulator/fake tests 2.app",
"--json_file",
"/path/to/tmp/json",
"--iossim",
- "[CWD]/src/out/Debug-iphonesimulator/iossim",
+ "[SLAVE_BUILD]/src/out/Debug-iphonesimulator/iossim",
"--platform",
"fake device",
"--version",
"7.1"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "fake tests 2 (fake device iOS 7.1)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
« no previous file with comments | « scripts/slave/recipes/webrtc/ios.py ('k') | scripts/slave/recipes/webrtc/ios.expected/gn_build.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698