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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2237793002: WebRTC: Add gyp_script parameter to ios recipe module's run_mb call. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Updated last expectation 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.expected/gn_build.json ('k') | scripts/slave/recipes/webrtc/ios.expected/no_tests.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/infrastructure_failure.json
diff --git a/scripts/slave/recipes/webrtc/ios.expected/infrastructure_failure.json b/scripts/slave/recipes/webrtc/ios.expected/infrastructure_failure.json
index 5eb4c7ede18f8ce3b1610693c4adcbab9d38565d..c3eba46f277e5ea18df5c87ebad6392137494f32 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/infrastructure_failure.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/infrastructure_failure.json
@@ -118,6 +118,7 @@
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"compiler\": \"ninja\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"mb_type\": \"gyp\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"sdk\": \"iphonesimulator8.0\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
@@ -140,7 +141,7 @@
"cmd": [
"echo",
"-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 }, \n \"additional_compile_targets\": [\n \"All\"\n ], \n \"compiler\": \"ninja\", \n \"configuration\": \"Debug\", \n \"env\": {}, \n \"gn_args\": [], \n \"mastername\": \"chromium.fake\", \n \"mb_type\": null, \n \"sdk\": \"iphonesimulator8.0\", \n \"tests\": [\n {\n \"app\": \"fake tests 1\", \n \"device type\": \"fake device\", \n \"id\": \"0\", \n \"os\": \"8.0\"\n }, \n {\n \"app\": \"fake tests 2\", \n \"device type\": \"fake device\", \n \"id\": \"1\", \n \"os\": \"7.1\"\n }\n ], \n \"triggered bots\": {}, \n \"use_analyze\": true, \n \"xcode version\": \"fake xcode version\"\n}"
+ "{\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 }, \n \"additional_compile_targets\": [\n \"All\"\n ], \n \"compiler\": \"ninja\", \n \"configuration\": \"Debug\", \n \"env\": {}, \n \"gn_args\": [], \n \"mastername\": \"chromium.fake\", \n \"mb_type\": \"gyp\", \n \"sdk\": \"iphonesimulator8.0\", \n \"tests\": [\n {\n \"app\": \"fake tests 1\", \n \"device type\": \"fake device\", \n \"id\": \"0\", \n \"os\": \"8.0\"\n }, \n {\n \"app\": \"fake tests 2\", \n \"device type\": \"fake device\", \n \"id\": \"1\", \n \"os\": \"7.1\"\n }\n ], \n \"triggered bots\": {}, \n \"use_analyze\": true, \n \"xcode version\": \"fake xcode version\"\n}"
],
"name": "finalize build config"
},
@@ -167,6 +168,7 @@
],
"cwd": "[BUILDER_CACHE]/ios/src",
"env": {
+ "GYP_CHROMIUM_NO_ACTION": "1",
"GYP_CROSSCOMPILE": "1",
"GYP_DEFINES": "fake gyp define 1=fake value 1 fake gyp define 2=fake value 2 component=static_library OS=ios",
"GYP_GENERATORS": "ninja",
@@ -175,10 +177,87 @@
},
"name": "gclient runhooks",
"~followup_annotations": [
- "@@@STEP_TEXT@<br />GYP_DEFINES:<br />fake gyp define 1=fake value 1<br />fake gyp define 2=fake value 2<br />component=static_library<br />OS=ios@@@"
+ "@@@STEP_TEXT@<br />GYP_DEFINES:<br />fake gyp define 1=fake value 1<br />fake gyp define 2=fake value 2<br />component=static_library<br />OS=ios<br />GYP_CHROMIUM_NO_ACTION=1@@@"
]
},
{
+ "cmd": [],
+ "name": "ensure_goma"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[build::cipd]/resources/bootstrap.py",
+ "--platform",
+ "mac-amd64",
+ "--dest-directory",
+ "[SLAVE_BUILD]/cipd",
+ "--json-output",
+ "/path/to/tmp/json"
+ ],
+ "name": "ensure_goma.install cipd",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[SLAVE_BUILD]/cipd/cipd",
+ "ensure",
+ "--root",
+ "[CACHE]/cipd/goma",
+ "--list",
+ "infra_internal/goma/client/mac-amd64 release",
+ "--json-output",
+ "/path/to/tmp/json",
+ "--service-account-json",
+ "/creds/service_accounts/service-account-goma-client.json"
+ ],
+ "name": "ensure_goma.ensure_installed",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/mac-amd64\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[BUILDER_CACHE]/ios/src/tools/mb/mb.py",
+ "gen",
+ "-m",
+ "chromium.fake",
+ "-b",
+ "ios",
+ "--config-file",
+ "[BUILDER_CACHE]/ios/src/webrtc/build/mb_config.pyl",
+ "--goma-dir",
+ "[CACHE]/cipd/goma",
+ "--gyp-script=[BUILDER_CACHE]/ios/src/webrtc/build/gyp_webrtc.py",
+ "//out/Debug-iphonesimulator"
+ ],
+ "cwd": "[BUILDER_CACHE]/ios/src",
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
+ "name": "generate_build_files"
+ },
+ {
"cmd": [
"ninja",
"-C",
« no previous file with comments | « scripts/slave/recipes/webrtc/ios.expected/gn_build.json ('k') | scripts/slave/recipes/webrtc/ios.expected/no_tests.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698