scripts/slave/recipes/ios/try.expected/swarming.json - Issue 2223743005: ios: fix iossim path

Unified Diff: scripts/slave/recipes/ios/try.expected/swarming.json

Issue 2223743005: ios: fix iossim path (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/ios/try.expected/parent.json ('k') | scripts/slave/recipes/ios/try.expected/swarming_tests_skipped.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/ios/try.expected/swarming.json

diff --git a/scripts/slave/recipes/ios/try.expected/swarming.json b/scripts/slave/recipes/ios/try.expected/swarming.json

index 6b31e0fa3f8fd50a4c80c3cd3a3c0fb6e6a285fa..5a6be15541824f882a28e9e7c78d1ff13c11c2d8 100644

--- a/scripts/slave/recipes/ios/try.expected/swarming.json

+++ b/scripts/slave/recipes/ios/try.expected/swarming.json

@@ -438,7 +438,7 @@

"python",

"-u",

"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",

- "{\n \"conditions\": [\n [\n \"OS == \\\"ios\\\"\", \n {\n \"variables\": {\n \"command\": [\n \"src/ios/build/bots/scripts/run.py\", \n \"--app\", \n \"<(app_path)\", \n \"--out-dir\", \n \"${ISOLATED_OUTDIR}\", \n \"--xcode-version\", \n \"<(xcode_version)\", \n \"--iossim\", \n \"src/out/Debug-iphonesimulator/iossim\", \n \"--platform\", \n \"<(platform)\", \n \"--version\", \n \"<(version)\"\n ], \n \"files\": [\n \"<(app_path)/\", \n \"src/ios/build/bots/scripts/\", \n \"src/out/Debug-iphonesimulator/iossim\"\n ]\n }\n }\n ]\n ]\n}",

+ "{\n \"conditions\": [\n [\n \"OS == \\\"ios\\\"\", \n {\n \"variables\": {\n \"command\": [\n \"src/ios/build/bots/scripts/run.py\", \n \"--app\", \n \"<(app_path)\", \n \"--out-dir\", \n \"${ISOLATED_OUTDIR}\", \n \"--xcode-version\", \n \"<(xcode_version)\", \n \"--iossim\", \n \"[BUILDER_CACHE]/ios_simulator_swarming/src/out/Debug-iphonesimulator/iossim\", \n \"--platform\", \n \"<(platform)\", \n \"--version\", \n \"<(version)\"\n ], \n \"files\": [\n \"<(app_path)/\", \n \"src/ios/build/bots/scripts/\", \n \"[BUILDER_CACHE]/ios_simulator_swarming/src/out/Debug-iphonesimulator/iossim\"\n ]\n }\n }\n ]\n ]\n}",

"[SLAVE_BUILD]/template.isolate"

"name": "isolate.generate template.isolate",

@@ -459,7 +459,7 @@

"@@@STEP_LOG_LINE@template.isolate@ \"--xcode-version\", @@@",

"@@@STEP_LOG_LINE@template.isolate@ \"<(xcode_version)\", @@@",

"@@@STEP_LOG_LINE@template.isolate@ \"--iossim\", @@@",

- "@@@STEP_LOG_LINE@template.isolate@ \"src/out/Debug-iphonesimulator/iossim\", @@@",

+ "@@@STEP_LOG_LINE@template.isolate@ \"[BUILDER_CACHE]/ios_simulator_swarming/src/out/Debug-iphonesimulator/iossim\", @@@",

smut 2016/08/10 23:53:32 This is wrong. This command needs to use relative

"@@@STEP_LOG_LINE@template.isolate@ \"--platform\", @@@",

"@@@STEP_LOG_LINE@template.isolate@ \"<(platform)\", @@@",

"@@@STEP_LOG_LINE@template.isolate@ \"--version\", @@@",

@@ -468,7 +468,7 @@

"@@@STEP_LOG_LINE@template.isolate@ \"files\": [@@@",

"@@@STEP_LOG_LINE@template.isolate@ \"<(app_path)/\", @@@",

"@@@STEP_LOG_LINE@template.isolate@ \"src/ios/build/bots/scripts/\", @@@",

- "@@@STEP_LOG_LINE@template.isolate@ \"src/out/Debug-iphonesimulator/iossim\"@@@",

+ "@@@STEP_LOG_LINE@template.isolate@ \"[BUILDER_CACHE]/ios_simulator_swarming/src/out/Debug-iphonesimulator/iossim\"@@@",

"@@@STEP_LOG_LINE@template.isolate@ ]@@@",

"@@@STEP_LOG_LINE@template.isolate@ }@@@",