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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/webrtc/ios.expected/basic.json

Issue 2226283002: webrtc: prepare for running under remote_run (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 4 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 8c74a2da0a4b69a0332eea0d495e30e0ff2b4359..44d9f075e4b684f64d10df79675f2fca0301fc76 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/basic.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/basic.json
@@ -25,6 +25,28 @@
"cmd": [
"python",
"-u",
+ "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
+ "[BUILDER_CACHE]/ios_debug",
+ "511"
+ ],
+ "name": "makedirs checkout path",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
+ "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
+ "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
+ "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
+ "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
+ "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--master",
"chromium.fake",
@@ -44,18 +66,39 @@
"/path/to/tmp/json",
"--revision",
"src@HEAD",
+ "--force",
"--output_manifest"
],
+ "cwd": "[BUILDER_CACHE]/ios_debug",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "bot_update",
"~followup_annotations": [
+ "@@@STEP_TEXT@Some step text@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@"
]
},
{
@@ -63,7 +106,7 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/webrtc/build/ios/chromium.fake/ios_debug.json",
+ "[BUILDER_CACHE]/ios_debug/src/webrtc/build/ios/chromium.fake/ios_debug.json",
"/path/to/tmp/json"
],
"name": "read build config",
@@ -177,7 +220,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
- "cwd": "[SLAVE_BUILD]/src",
+ "cwd": "[BUILDER_CACHE]/ios_debug/src",
"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",
@@ -197,7 +240,7 @@
"-u",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
"--src-dir",
- "[SLAVE_BUILD]/src",
+ "[BUILDER_CACHE]/ios_debug/src",
"--output-json",
"/path/to/tmp/json"
],
@@ -227,9 +270,11 @@
"--target",
"Debug-iphonesimulator",
"--src-dir",
- "[SLAVE_BUILD]/src",
+ "[BUILDER_CACHE]/ios_debug/src",
"--goma-cache-dir",
"[GOMA_CACHE]",
+ "--goma-deps-cache-dir",
+ "[GOMA_DEPS_CACHE]",
"--compiler",
"goma-clang",
"--goma-jsonstatus",
@@ -241,7 +286,7 @@
"--",
"All"
],
- "cwd": "[SLAVE_BUILD]/src/out/Debug-iphonesimulator",
+ "cwd": "[BUILDER_CACHE]/ios_debug/src/out/Debug-iphonesimulator",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -255,11 +300,11 @@
"cmd": [
"RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/run.py",
"--app",
- "[SLAVE_BUILD]/src/out/Debug-iphonesimulator/fake tests 1.app",
+ "[BUILDER_CACHE]/ios_debug/src/out/Debug-iphonesimulator/fake tests 1.app",
"--json_file",
"/path/to/tmp/json",
"--iossim",
- "[SLAVE_BUILD]/src/out/Debug-iphonesimulator/iossim",
+ "[BUILDER_CACHE]/ios_debug/src/out/Debug-iphonesimulator/iossim",
"--platform",
"fake device",
"--version",
@@ -289,11 +334,11 @@
"cmd": [
"RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/run.py",
"--app",
- "[SLAVE_BUILD]/src/out/Debug-iphonesimulator/fake tests 2.app",
+ "[BUILDER_CACHE]/ios_debug/src/out/Debug-iphonesimulator/fake tests 2.app",
"--json_file",
"/path/to/tmp/json",
"--iossim",
- "[SLAVE_BUILD]/src/out/Debug-iphonesimulator/iossim",
+ "[BUILDER_CACHE]/ios_debug/src/out/Debug-iphonesimulator/iossim",
"--platform",
"fake device",
"--version",
« 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