scripts/slave/recipes/ios/unified_builder_tester.expected/basic.json - Issue 1145733003: ios: Allow bot configs to set extra env variables

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

Issue 1145733003: ios: Allow bot configs to set extra env variables (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master

Patch Set: Provide a default self.__config['env'] Created 5 years, 7 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/ios/unified_builder_tester.py ('k') | scripts/slave/recipes/ios/unified_builder_tester.expected/infrastructure_failure.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/ios/unified_builder_tester.expected/basic.json

diff --git a/scripts/slave/recipes/ios/unified_builder_tester.expected/basic.json b/scripts/slave/recipes/ios/unified_builder_tester.expected/basic.json

index 8870567045caa9847d733c16989c299cc5ee9f84..3207e620abbff7512044416b03abb7ae67fc2a1d 100644

--- a/scripts/slave/recipes/ios/unified_builder_tester.expected/basic.json

+++ b/scripts/slave/recipes/ios/unified_builder_tester.expected/basic.json

@@ -103,6 +103,10 @@

"@@@STEP_LOG_LINE@json.output@ }, @@@",

"@@@STEP_LOG_LINE@json.output@ \"compiler\": \"xcodebuild\", @@@",

"@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"fake env var 1\": \"fake env value 1\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"fake env var 2\": \"fake env value 2\"@@@",

+ "@@@STEP_LOG_LINE@json.output@ }, @@@",

"@@@STEP_LOG_LINE@json.output@ \"sdk\": \"iphonesimulator8.0\", @@@",

"@@@STEP_LOG_LINE@json.output@ \"tests\": [@@@",

"@@@STEP_LOG_LINE@json.output@ {@@@",

@@ -125,7 +129,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 \"compiler\": \"xcodebuild\", \n \"configuration\": \"Debug\", \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 \"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 \"compiler\": \"xcodebuild\", \n \"configuration\": \"Debug\", \n \"env\": {\n \"fake env var 1\": \"fake env value 1\", \n \"fake env var 2\": \"fake env value 2\"\n }, \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 \"xcode version\": \"fake xcode version\"\n}"

"cwd": "[SLAVE_BUILD]",

"name": "finalize build config"

@@ -157,7 +161,9 @@

"GYP_DEFINES": "fake gyp define 1=fake value 1 fake gyp define 2=fake value 2 component=static_library OS=ios",

"GYP_GENERATORS": "xcode",

"GYP_GENERATOR_FLAGS": "xcode_project_version=3.2",

- "LANDMINES_VERBOSE": "1"

+ "LANDMINES_VERBOSE": "1",

+ "fake env var 1": "fake env value 1",

+ "fake env var 2": "fake env value 2"

"name": "gclient runhooks",

"~followup_annotations": [