Index: scripts/slave/recipes/ios/try.expected/parent.json |
diff --git a/scripts/slave/recipes/ios/try.expected/parent.json b/scripts/slave/recipes/ios/try.expected/parent.json |
index 3ad03476e1a4a656147546846901cc6e7cf58ffc..0b6b1e9a223123e32d72903914b10c0814f7dc80 100644 |
--- a/scripts/slave/recipes/ios/try.expected/parent.json |
+++ b/scripts/slave/recipes/ios/try.expected/parent.json |
@@ -448,7 +448,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 \"--args-json\", \n \"{\\\"xctest\\\": <(xctest)}\", \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", |
@@ -464,6 +464,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\", @@@", |
@@ -493,7 +495,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/Debug-iphonesimulator/fake tests.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 tests.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 tests.app\", \n \"--config-variable\", \n \"xcode_version\", \n \"fake xcode version\", \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/Debug-iphonesimulator/fake tests.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", |
@@ -511,6 +513,9 @@ |
"@@@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\", @@@", |
+ "@@@STEP_LOG_LINE@0.isolate.gen.json@ \"--config-variable\", @@@", |
+ "@@@STEP_LOG_LINE@0.isolate.gen.json@ \"xctest\", @@@", |
+ "@@@STEP_LOG_LINE@0.isolate.gen.json@ \"false\", @@@", |
"@@@STEP_LOG_LINE@0.isolate.gen.json@ \"--isolate\", @@@", |
"@@@STEP_LOG_LINE@0.isolate.gen.json@ \"[SLAVE_BUILD]/template.isolate\", @@@", |
"@@@STEP_LOG_LINE@0.isolate.gen.json@ \"--isolated\", @@@", |