| Index: scripts/slave/recipe_modules/ios/example.expected/errors.json
|
| diff --git a/scripts/slave/recipe_modules/ios/example.expected/errors.json b/scripts/slave/recipe_modules/ios/example.expected/errors.json
|
| index 8beb8d0abe6f7ebbafe9966d5893ca51c2adc75b..73dc3db3519b67c8b6b63277070e8dcd9bdd47c0 100644
|
| --- a/scripts/slave/recipe_modules/ios/example.expected/errors.json
|
| +++ b/scripts/slave/recipe_modules/ios/example.expected/errors.json
|
| @@ -315,7 +315,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 ], \n \"files\": [\n \"<(app_path)/\", \n \"src/ios/build/bots/scripts/\"\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 \"--args-json\", \n \"{\\\"xctest\\\": <(xctest)}\", \n \"--out-dir\", \n \"${ISOLATED_OUTDIR}\", \n \"--xcode-version\", \n \"<(xcode_version)\"\n ], \n \"files\": [\n \"<(app_path)/\", \n \"src/ios/build/bots/scripts/\"\n ]\n }\n }\n ]\n ]\n}",
|
| "[SLAVE_BUILD]/template.isolate"
|
| ],
|
| "name": "isolate.generate template.isolate",
|
| @@ -331,6 +331,8 @@
|
| "@@@STEP_LOG_LINE@template.isolate@ \"src/ios/build/bots/scripts/run.py\", @@@",
|
| "@@@STEP_LOG_LINE@template.isolate@ \"--app\", @@@",
|
| "@@@STEP_LOG_LINE@template.isolate@ \"<(app_path)\", @@@",
|
| + "@@@STEP_LOG_LINE@template.isolate@ \"--args-json\", @@@",
|
| + "@@@STEP_LOG_LINE@template.isolate@ \"{\\\"xctest\\\": <(xctest)}\", @@@",
|
| "@@@STEP_LOG_LINE@template.isolate@ \"--out-dir\", @@@",
|
| "@@@STEP_LOG_LINE@template.isolate@ \"${ISOLATED_OUTDIR}\", @@@",
|
| "@@@STEP_LOG_LINE@template.isolate@ \"--xcode-version\", @@@",
|
| @@ -353,7 +355,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 \"src/out/Release-iphoneos/fake test 1.app\", \n \"--config-variable\", \n \"xcode_version\", \n \"6.1.1\", \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/Release-iphoneos/fake test 1.app\"\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/Release-iphoneos/fake test 1.app\", \n \"--config-variable\", \n \"xcode_version\", \n \"6.1.1\", \n \"--config-variable\", \n \"xctest\", \n \"false\", \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/Release-iphoneos/fake test 1.app\"\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",
|
| @@ -368,7 +370,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 \"src/out/Release-iphoneos/fake test 2.app\", \n \"--config-variable\", \n \"xcode_version\", \n \"6.1.1\", \n \"--isolate\", \n \"[SLAVE_BUILD]/template.isolate\", \n \"--isolated\", \n \"[TMP_BASE]/isolate_tmp_1/1.isolated\", \n \"--path-variable\", \n \"app_path\", \n \"src/out/Release-iphoneos/fake test 2.app\"\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/Release-iphoneos/fake test 2.app\", \n \"--config-variable\", \n \"xcode_version\", \n \"6.1.1\", \n \"--config-variable\", \n \"xctest\", \n \"false\", \n \"--isolate\", \n \"[SLAVE_BUILD]/template.isolate\", \n \"--isolated\", \n \"[TMP_BASE]/isolate_tmp_1/1.isolated\", \n \"--path-variable\", \n \"app_path\", \n \"src/out/Release-iphoneos/fake test 2.app\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
|
| "[TMP_BASE]/isolate_tmp_1/1.isolate.gen.json"
|
| ],
|
| "name": "isolate.generate 1.isolate.gen.json",
|
| @@ -386,6 +388,9 @@
|
| "@@@STEP_LOG_LINE@1.isolate.gen.json@ \"--config-variable\", @@@",
|
| "@@@STEP_LOG_LINE@1.isolate.gen.json@ \"xcode_version\", @@@",
|
| "@@@STEP_LOG_LINE@1.isolate.gen.json@ \"6.1.1\", @@@",
|
| + "@@@STEP_LOG_LINE@1.isolate.gen.json@ \"--config-variable\", @@@",
|
| + "@@@STEP_LOG_LINE@1.isolate.gen.json@ \"xctest\", @@@",
|
| + "@@@STEP_LOG_LINE@1.isolate.gen.json@ \"false\", @@@",
|
| "@@@STEP_LOG_LINE@1.isolate.gen.json@ \"--isolate\", @@@",
|
| "@@@STEP_LOG_LINE@1.isolate.gen.json@ \"[SLAVE_BUILD]/template.isolate\", @@@",
|
| "@@@STEP_LOG_LINE@1.isolate.gen.json@ \"--isolated\", @@@",
|
| @@ -405,7 +410,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 \"src/out/Release-iphoneos/fake test 3.app\", \n \"--config-variable\", \n \"xcode_version\", \n \"6.1.1\", \n \"--isolate\", \n \"[SLAVE_BUILD]/template.isolate\", \n \"--isolated\", \n \"[TMP_BASE]/isolate_tmp_1/2.isolated\", \n \"--path-variable\", \n \"app_path\", \n \"src/out/Release-iphoneos/fake test 3.app\"\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/Release-iphoneos/fake test 3.app\", \n \"--config-variable\", \n \"xcode_version\", \n \"6.1.1\", \n \"--config-variable\", \n \"xctest\", \n \"false\", \n \"--isolate\", \n \"[SLAVE_BUILD]/template.isolate\", \n \"--isolated\", \n \"[TMP_BASE]/isolate_tmp_1/2.isolated\", \n \"--path-variable\", \n \"app_path\", \n \"src/out/Release-iphoneos/fake test 3.app\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
|
| "[TMP_BASE]/isolate_tmp_1/2.isolate.gen.json"
|
| ],
|
| "name": "isolate.generate 2.isolate.gen.json",
|
| @@ -423,6 +428,9 @@
|
| "@@@STEP_LOG_LINE@2.isolate.gen.json@ \"--config-variable\", @@@",
|
| "@@@STEP_LOG_LINE@2.isolate.gen.json@ \"xcode_version\", @@@",
|
| "@@@STEP_LOG_LINE@2.isolate.gen.json@ \"6.1.1\", @@@",
|
| + "@@@STEP_LOG_LINE@2.isolate.gen.json@ \"--config-variable\", @@@",
|
| + "@@@STEP_LOG_LINE@2.isolate.gen.json@ \"xctest\", @@@",
|
| + "@@@STEP_LOG_LINE@2.isolate.gen.json@ \"false\", @@@",
|
| "@@@STEP_LOG_LINE@2.isolate.gen.json@ \"--isolate\", @@@",
|
| "@@@STEP_LOG_LINE@2.isolate.gen.json@ \"[SLAVE_BUILD]/template.isolate\", @@@",
|
| "@@@STEP_LOG_LINE@2.isolate.gen.json@ \"--isolated\", @@@",
|
| @@ -442,7 +450,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 \"src/out/Release-iphoneos/fake test 4.app\", \n \"--config-variable\", \n \"xcode_version\", \n \"6.1.1\", \n \"--isolate\", \n \"[SLAVE_BUILD]/template.isolate\", \n \"--isolated\", \n \"[TMP_BASE]/isolate_tmp_1/3.isolated\", \n \"--path-variable\", \n \"app_path\", \n \"src/out/Release-iphoneos/fake test 4.app\"\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/Release-iphoneos/fake test 4.app\", \n \"--config-variable\", \n \"xcode_version\", \n \"6.1.1\", \n \"--config-variable\", \n \"xctest\", \n \"false\", \n \"--isolate\", \n \"[SLAVE_BUILD]/template.isolate\", \n \"--isolated\", \n \"[TMP_BASE]/isolate_tmp_1/3.isolated\", \n \"--path-variable\", \n \"app_path\", \n \"src/out/Release-iphoneos/fake test 4.app\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
|
| "[TMP_BASE]/isolate_tmp_1/3.isolate.gen.json"
|
| ],
|
| "name": "isolate.generate 3.isolate.gen.json",
|
| @@ -460,6 +468,9 @@
|
| "@@@STEP_LOG_LINE@3.isolate.gen.json@ \"--config-variable\", @@@",
|
| "@@@STEP_LOG_LINE@3.isolate.gen.json@ \"xcode_version\", @@@",
|
| "@@@STEP_LOG_LINE@3.isolate.gen.json@ \"6.1.1\", @@@",
|
| + "@@@STEP_LOG_LINE@3.isolate.gen.json@ \"--config-variable\", @@@",
|
| + "@@@STEP_LOG_LINE@3.isolate.gen.json@ \"xctest\", @@@",
|
| + "@@@STEP_LOG_LINE@3.isolate.gen.json@ \"false\", @@@",
|
| "@@@STEP_LOG_LINE@3.isolate.gen.json@ \"--isolate\", @@@",
|
| "@@@STEP_LOG_LINE@3.isolate.gen.json@ \"[SLAVE_BUILD]/template.isolate\", @@@",
|
| "@@@STEP_LOG_LINE@3.isolate.gen.json@ \"--isolated\", @@@",
|
|
|