| 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 e881b5299ab7ea8c5df8ffc662490d0068ae9c57..ddf5c303b352e49cc693a0e4356537804209d628 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 \"[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}",
|
| + "{\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}",
|
| "[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@ \"[BUILDER_CACHE]/ios_simulator_swarming/src/out/Debug-iphonesimulator/iossim\", @@@",
|
| + "@@@STEP_LOG_LINE@template.isolate@ \"src/out/Debug-iphonesimulator/iossim\", @@@",
|
| "@@@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@ \"[BUILDER_CACHE]/ios_simulator_swarming/src/out/Debug-iphonesimulator/iossim\"@@@",
|
| + "@@@STEP_LOG_LINE@template.isolate@ \"src/out/Debug-iphonesimulator/iossim\"@@@",
|
| "@@@STEP_LOG_LINE@template.isolate@ ]@@@",
|
| "@@@STEP_LOG_LINE@template.isolate@ }@@@",
|
| "@@@STEP_LOG_LINE@template.isolate@ }@@@",
|
| @@ -483,7 +483,7 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "{\n \"args\": [\n \"--config-variable\", \n \"OS\", \n \"ios\", \n \"--config-variable\", \n \"app_path\", \n \"[BUILDER_CACHE]/ios_simulator_swarming/src/out/Debug-iphonesimulator/fake test.app\", \n \"--config-variable\", \n \"xcode_version\", \n \"fake xcode version\", \n \"--isolate\", \n \"[SLAVE_BUILD]/template.isolate\", \n \"--isolated\", \n \"[TMP_BASE]/isolate_tmp_1/0.isolated\", \n \"--path-variable\", \n \"app_path\", \n \"[BUILDER_CACHE]/ios_simulator_swarming/src/out/Debug-iphonesimulator/fake test.app\", \n \"--config-variable\", \n \"platform\", \n \"fake device\", \n \"--config-variable\", \n \"version\", \n \"8.1\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
|
| + "{\n \"args\": [\n \"--config-variable\", \n \"OS\", \n \"ios\", \n \"--config-variable\", \n \"app_path\", \n \"src/out/Debug-iphonesimulator/fake test.app\", \n \"--config-variable\", \n \"xcode_version\", \n \"fake xcode version\", \n \"--isolate\", \n \"[SLAVE_BUILD]/template.isolate\", \n \"--isolated\", \n \"[TMP_BASE]/isolate_tmp_1/0.isolated\", \n \"--path-variable\", \n \"app_path\", \n \"src/out/Debug-iphonesimulator/fake test.app\", \n \"--config-variable\", \n \"platform\", \n \"fake device\", \n \"--config-variable\", \n \"version\", \n \"8.1\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
|
| "[TMP_BASE]/isolate_tmp_1/0.isolate.gen.json"
|
| ],
|
| "name": "isolate.generate 0.isolate.gen.json",
|
| @@ -497,7 +497,7 @@
|
| "@@@STEP_LOG_LINE@0.isolate.gen.json@ \"ios\", @@@",
|
| "@@@STEP_LOG_LINE@0.isolate.gen.json@ \"--config-variable\", @@@",
|
| "@@@STEP_LOG_LINE@0.isolate.gen.json@ \"app_path\", @@@",
|
| - "@@@STEP_LOG_LINE@0.isolate.gen.json@ \"[BUILDER_CACHE]/ios_simulator_swarming/src/out/Debug-iphonesimulator/fake test.app\", @@@",
|
| + "@@@STEP_LOG_LINE@0.isolate.gen.json@ \"src/out/Debug-iphonesimulator/fake test.app\", @@@",
|
| "@@@STEP_LOG_LINE@0.isolate.gen.json@ \"--config-variable\", @@@",
|
| "@@@STEP_LOG_LINE@0.isolate.gen.json@ \"xcode_version\", @@@",
|
| "@@@STEP_LOG_LINE@0.isolate.gen.json@ \"fake xcode version\", @@@",
|
| @@ -507,7 +507,7 @@
|
| "@@@STEP_LOG_LINE@0.isolate.gen.json@ \"[TMP_BASE]/isolate_tmp_1/0.isolated\", @@@",
|
| "@@@STEP_LOG_LINE@0.isolate.gen.json@ \"--path-variable\", @@@",
|
| "@@@STEP_LOG_LINE@0.isolate.gen.json@ \"app_path\", @@@",
|
| - "@@@STEP_LOG_LINE@0.isolate.gen.json@ \"[BUILDER_CACHE]/ios_simulator_swarming/src/out/Debug-iphonesimulator/fake test.app\", @@@",
|
| + "@@@STEP_LOG_LINE@0.isolate.gen.json@ \"src/out/Debug-iphonesimulator/fake test.app\", @@@",
|
| "@@@STEP_LOG_LINE@0.isolate.gen.json@ \"--config-variable\", @@@",
|
| "@@@STEP_LOG_LINE@0.isolate.gen.json@ \"platform\", @@@",
|
| "@@@STEP_LOG_LINE@0.isolate.gen.json@ \"fake device\", @@@",
|
|
|