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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipe_modules/ios/example.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/recipe_modules/ios/api.py ('k') | scripts/slave/recipe_modules/ios/example.expected/clobber.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/ios/example.expected/basic.json
diff --git a/scripts/slave/recipe_modules/ios/example.expected/basic.json b/scripts/slave/recipe_modules/ios/example.expected/basic.json
index 18f1d4566330c4955c16010a5715246b685cddfa..cf96076b743bf74864e212f901097cc8a1f6941b 100644
--- a/scripts/slave/recipe_modules/ios/example.expected/basic.json
+++ b/scripts/slave/recipe_modules/ios/example.expected/basic.json
@@ -339,7 +339,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",
@@ -355,6 +355,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\", @@@",
@@ -384,7 +386,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 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/Debug-iphonesimulator/fake test 1.app\", \n \"--config-variable\", \n \"platform\", \n \"fake device 1\", \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 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/Debug-iphonesimulator/fake test 1.app\", \n \"--config-variable\", \n \"platform\", \n \"fake device 1\", \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",
@@ -402,6 +404,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@ \"6.1.1\", @@@",
+ "@@@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\", @@@",
@@ -427,7 +432,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 included 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/1.isolated\", \n \"--path-variable\", \n \"app_path\", \n \"src/out/Debug-iphonesimulator/fake included test 1.app\", \n \"--config-variable\", \n \"platform\", \n \"fake device 1\", \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 included 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/1.isolated\", \n \"--path-variable\", \n \"app_path\", \n \"src/out/Debug-iphonesimulator/fake included test 1.app\", \n \"--config-variable\", \n \"platform\", \n \"fake device 1\", \n \"--config-variable\", \n \"version\", \n \"8.1\"\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",
@@ -445,6 +450,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\", @@@",
@@ -470,7 +478,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 included 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/2.isolated\", \n \"--path-variable\", \n \"app_path\", \n \"src/out/Debug-iphonesimulator/fake included test 2.app\", \n \"--config-variable\", \n \"platform\", \n \"fake device 1\", \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 included 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/2.isolated\", \n \"--path-variable\", \n \"app_path\", \n \"src/out/Debug-iphonesimulator/fake included test 2.app\", \n \"--config-variable\", \n \"platform\", \n \"fake device 1\", \n \"--config-variable\", \n \"version\", \n \"8.1\"\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",
@@ -488,6 +496,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\", @@@",
@@ -513,7 +524,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 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/3.isolated\", \n \"--path-variable\", \n \"app_path\", \n \"src/out/Debug-iphonesimulator/fake test 2.app\", \n \"--config-variable\", \n \"platform\", \n \"fake device 2\", \n \"--config-variable\", \n \"version\", \n \"7.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 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/3.isolated\", \n \"--path-variable\", \n \"app_path\", \n \"src/out/Debug-iphonesimulator/fake test 2.app\", \n \"--config-variable\", \n \"platform\", \n \"fake device 2\", \n \"--config-variable\", \n \"version\", \n \"7.1\"\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",
@@ -531,6 +542,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\", @@@",
@@ -556,7 +570,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 included 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/4.isolated\", \n \"--path-variable\", \n \"app_path\", \n \"src/out/Debug-iphonesimulator/fake included test 1.app\", \n \"--config-variable\", \n \"platform\", \n \"fake device 2\", \n \"--config-variable\", \n \"version\", \n \"7.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 included 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/4.isolated\", \n \"--path-variable\", \n \"app_path\", \n \"src/out/Debug-iphonesimulator/fake included test 1.app\", \n \"--config-variable\", \n \"platform\", \n \"fake device 2\", \n \"--config-variable\", \n \"version\", \n \"7.1\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
"[TMP_BASE]/isolate_tmp_1/4.isolate.gen.json"
],
"name": "isolate.generate 4.isolate.gen.json",
@@ -574,6 +588,9 @@
"@@@STEP_LOG_LINE@4.isolate.gen.json@ \"--config-variable\", @@@",
"@@@STEP_LOG_LINE@4.isolate.gen.json@ \"xcode_version\", @@@",
"@@@STEP_LOG_LINE@4.isolate.gen.json@ \"6.1.1\", @@@",
+ "@@@STEP_LOG_LINE@4.isolate.gen.json@ \"--config-variable\", @@@",
+ "@@@STEP_LOG_LINE@4.isolate.gen.json@ \"xctest\", @@@",
+ "@@@STEP_LOG_LINE@4.isolate.gen.json@ \"false\", @@@",
"@@@STEP_LOG_LINE@4.isolate.gen.json@ \"--isolate\", @@@",
"@@@STEP_LOG_LINE@4.isolate.gen.json@ \"[SLAVE_BUILD]/template.isolate\", @@@",
"@@@STEP_LOG_LINE@4.isolate.gen.json@ \"--isolated\", @@@",
@@ -599,7 +616,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 included 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/5.isolated\", \n \"--path-variable\", \n \"app_path\", \n \"src/out/Debug-iphonesimulator/fake included test 2.app\", \n \"--config-variable\", \n \"platform\", \n \"fake device 2\", \n \"--config-variable\", \n \"version\", \n \"7.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 included 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/5.isolated\", \n \"--path-variable\", \n \"app_path\", \n \"src/out/Debug-iphonesimulator/fake included test 2.app\", \n \"--config-variable\", \n \"platform\", \n \"fake device 2\", \n \"--config-variable\", \n \"version\", \n \"7.1\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
"[TMP_BASE]/isolate_tmp_1/5.isolate.gen.json"
],
"name": "isolate.generate 5.isolate.gen.json",
@@ -617,6 +634,9 @@
"@@@STEP_LOG_LINE@5.isolate.gen.json@ \"--config-variable\", @@@",
"@@@STEP_LOG_LINE@5.isolate.gen.json@ \"xcode_version\", @@@",
"@@@STEP_LOG_LINE@5.isolate.gen.json@ \"6.1.1\", @@@",
+ "@@@STEP_LOG_LINE@5.isolate.gen.json@ \"--config-variable\", @@@",
+ "@@@STEP_LOG_LINE@5.isolate.gen.json@ \"xctest\", @@@",
+ "@@@STEP_LOG_LINE@5.isolate.gen.json@ \"false\", @@@",
"@@@STEP_LOG_LINE@5.isolate.gen.json@ \"--isolate\", @@@",
"@@@STEP_LOG_LINE@5.isolate.gen.json@ \"[SLAVE_BUILD]/template.isolate\", @@@",
"@@@STEP_LOG_LINE@5.isolate.gen.json@ \"--isolated\", @@@",
« no previous file with comments | « scripts/slave/recipe_modules/ios/api.py ('k') | scripts/slave/recipe_modules/ios/example.expected/clobber.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698