Reland "Support xctests"

scripts/slave/recipes/ios/try.expected/basic.json

 [
   {
     "cmd": [
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/host_info.py",
       "--json-file",
       "/path/to/tmp/json"
     ],
     "name": "host and tools info",
     "~followup_annotations": [
       "@@@STEP_TEXT@<br />OS X 1.2.3, Xcode 6.7.8 (5D342509a)@@@",
@@ skipping 151 matching lines @@
       "@@@STEP_LOG_LINE@json.output@  \"GYP_DEFINES\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"fake gyp define 1\": \"fake value 1\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"fake gyp define 2\": \"fake value 2\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"configuration\": \"Debug\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"sdk\": \"iphonesimulator8.0\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tests\": [@@@",
       "@@@STEP_LOG_LINE@json.output@    {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"app\": \"fake tests\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"device type\": \"fake device\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"os\": \"8.1\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"os\": \"8.1\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"xctest\": true@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  ], @@@",
       "@@@STEP_LOG_LINE@json.output@  \"xcode version\": \"fake xcode version\"@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "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  \"additional_compile_targets\": [\n    \"All\"\n  ], \n  \"configuration\": \"Debug\", \n  \"env\": {}, \n  \"gn_args\": [], \n  \"mastername\": \"chromium.mac\", \n  \"mb_type\": null, \n  \"sdk\": \"iphonesimulator8.0\", \n  \"tests\": [\n    {\n      \"app\": \"fake tests\", \n      \"device type\": \"fake device\", \n      \"id\": \"0\", \n      \"os\": \"8.1\"\n    }\n  ], \n  \"triggered bots\": {}, \n  \"use_analyze\": true, \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  \"additional_compile_targets\": [\n    \"All\"\n  ], \n  \"configuration\": \"Debug\", \n  \"env\": {}, \n  \"gn_args\": [], \n  \"mastername\": \"chromium.mac\", \n  \"mb_type\": null, \n  \"sdk\": \"iphonesimulator8.0\", \n  \"tests\": [\n    {\n      \"app\": \"fake tests\", \n      \"device type\": \"fake device\", \n      \"id\": \"0\", \n      \"os\": \"8.1\", \n      \"xctest\": true\n    }\n  ], \n  \"triggered bots\": {}, \n  \"use_analyze\": true, \n  \"xcode version\": \"fake xcode version\"\n}"
     ],
     "name": "finalize build config"
   },
   {
     "cmd": [
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/find_xcode.py",
       "--json-file",
       "/path/to/tmp/json",
       "--version",
       "fake xcode version"
@@ skipping 230 matching lines @@
   },
   {
     "cmd": [],
     "name": "isolate"
   },
   {
     "cmd": [
       "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",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@template.isolate@{@@@",
       "@@@STEP_LOG_LINE@template.isolate@  \"conditions\": [@@@",
       "@@@STEP_LOG_LINE@template.isolate@    [@@@",
       "@@@STEP_LOG_LINE@template.isolate@      \"OS == \\\"ios\\\"\", @@@",
       "@@@STEP_LOG_LINE@template.isolate@      {@@@",
       "@@@STEP_LOG_LINE@template.isolate@        \"variables\": {@@@",
       "@@@STEP_LOG_LINE@template.isolate@          \"command\": [@@@",
       "@@@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\", @@@",
       "@@@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@            \"--platform\", @@@",
       "@@@STEP_LOG_LINE@template.isolate@            \"<(platform)\", @@@",
       "@@@STEP_LOG_LINE@template.isolate@            \"--version\", @@@",
       "@@@STEP_LOG_LINE@template.isolate@            \"<(version)\"@@@",
       "@@@STEP_LOG_LINE@template.isolate@          ], @@@",
       "@@@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@          ]@@@",
       "@@@STEP_LOG_LINE@template.isolate@        }@@@",
       "@@@STEP_LOG_LINE@template.isolate@      }@@@",
       "@@@STEP_LOG_LINE@template.isolate@    ]@@@",
       "@@@STEP_LOG_LINE@template.isolate@  ]@@@",
       "@@@STEP_LOG_LINE@template.isolate@}@@@",
       "@@@STEP_LOG_END@template.isolate@@@"
     ]
   },
   {
     "cmd": [
       "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    \"true\", \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",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_TEXT@fake tests (fake device iOS 8.1)@@@",
       "@@@STEP_LOG_LINE@0.isolate.gen.json@{@@@",
       "@@@STEP_LOG_LINE@0.isolate.gen.json@  \"args\": [@@@",
       "@@@STEP_LOG_LINE@0.isolate.gen.json@    \"--config-variable\", @@@",
       "@@@STEP_LOG_LINE@0.isolate.gen.json@    \"OS\", @@@",
       "@@@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@    \"src/out/Debug-iphonesimulator/fake tests.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\", @@@",
+      "@@@STEP_LOG_LINE@0.isolate.gen.json@    \"--config-variable\", @@@",
+      "@@@STEP_LOG_LINE@0.isolate.gen.json@    \"xctest\", @@@",
+      "@@@STEP_LOG_LINE@0.isolate.gen.json@    \"true\", @@@",
       "@@@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\", @@@",
       "@@@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@    \"src/out/Debug-iphonesimulator/fake tests.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\", @@@",
@@ skipping 170 matching lines @@
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@"
     ]
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]