Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(519)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2446843002: Reland "Support xctests" (Closed)
Patch Set: Created 4 years, 2 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.py ('k') | scripts/slave/recipes/ios/try.expected/gn.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/ios/try.expected/basic.json
diff --git a/scripts/slave/recipes/ios/try.expected/basic.json b/scripts/slave/recipes/ios/try.expected/basic.json
index 50d1899f77bb772596f097e08f582a11c229d136..527e63a0b9e9b742d4c06a9d66cd5cac1b293329 100644
--- a/scripts/slave/recipes/ios/try.expected/basic.json
+++ b/scripts/slave/recipes/ios/try.expected/basic.json
@@ -169,7 +169,8 @@
"@@@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\"@@@",
@@ -181,7 +182,7 @@
"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"
},
@@ -432,7 +433,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",
@@ -448,6 +449,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\", @@@",
@@ -477,7 +480,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 \"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",
@@ -495,6 +498,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@ \"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\", @@@",
« no previous file with comments | « scripts/slave/recipes/ios/try.py ('k') | scripts/slave/recipes/ios/try.expected/gn.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698