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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2264223002: Enable swarming for iOS try bots (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build@master
Patch Set: Fix Created 4 years, 4 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.expected/icu_patch.json ('k') | scripts/slave/recipes/ios/try.expected/parent.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/no_tests.json
diff --git a/scripts/slave/recipes/ios/try.expected/swarming_tests_skipped.json b/scripts/slave/recipes/ios/try.expected/no_tests.json
similarity index 88%
copy from scripts/slave/recipes/ios/try.expected/swarming_tests_skipped.json
copy to scripts/slave/recipes/ios/try.expected/no_tests.json
index e6b90fe7113d8087fc604d6b53d4fc9dd4128342..2384605405536a13b2b976054ce3e1fb1078c9e4 100644
--- a/scripts/slave/recipes/ios/try.expected/swarming_tests_skipped.json
+++ b/scripts/slave/recipes/ios/try.expected/no_tests.json
@@ -26,7 +26,7 @@
"python",
"-u",
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
- "[BUILDER_CACHE]/ios_simulator_swarming",
+ "[BUILDER_CACHE]/ios_simulator",
"511"
],
"name": "makedirs checkout path",
@@ -51,7 +51,7 @@
"--master",
"tryserver.fake",
"--builder",
- "ios-simulator-swarming",
+ "ios-simulator",
"--slave",
"fake-vm",
"--spec",
@@ -73,7 +73,7 @@
"--force",
"--output_manifest"
],
- "cwd": "[BUILDER_CACHE]/ios_simulator_swarming",
+ "cwd": "[BUILDER_CACHE]/ios_simulator",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -158,7 +158,7 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]/ios_simulator_swarming/src/ios/build/bots/chromium.mac/ios-simulator-swarming.json",
+ "[BUILDER_CACHE]/ios_simulator/src/ios/build/bots/chromium.mac/ios-simulator.json",
"/path/to/tmp/json"
],
"name": "read build config",
@@ -171,13 +171,7 @@
"@@@STEP_LOG_LINE@json.output@ \"compiler\": \"ninja\", @@@",
"@@@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 test\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device type\": \"fake device\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"8.1\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ], @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"tests\": [], @@@",
"@@@STEP_LOG_LINE@json.output@ \"xcode version\": \"fake xcode version\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
@@ -187,7 +181,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 \"compiler\": \"ninja\", \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 test\", \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 \"compiler\": \"ninja\", \n \"configuration\": \"Debug\", \n \"env\": {}, \n \"gn_args\": [], \n \"mastername\": \"chromium.mac\", \n \"mb_type\": null, \n \"sdk\": \"iphonesimulator8.0\", \n \"tests\": [], \n \"triggered bots\": {}, \n \"use_analyze\": true, \n \"xcode version\": \"fake xcode version\"\n}"
],
"name": "finalize build config"
},
@@ -212,7 +206,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
- "cwd": "[BUILDER_CACHE]/ios_simulator_swarming/src",
+ "cwd": "[BUILDER_CACHE]/ios_simulator/src",
"env": {
"GYP_CROSSCOMPILE": "1",
"GYP_DEFINES": "fake gyp define 1=fake value 1 fake gyp define 2=fake value 2 component=static_library OS=ios",
@@ -232,7 +226,7 @@
"--cached",
"--name-only"
],
- "cwd": "[BUILDER_CACHE]/ios_simulator_swarming/src",
+ "cwd": "[BUILDER_CACHE]/ios_simulator/src",
"name": "git diff to analyze patch",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -245,7 +239,7 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]/ios_simulator_swarming/src/testing/buildbot/trybot_analyze_config.json",
+ "[BUILDER_CACHE]/ios_simulator/src/testing/buildbot/trybot_analyze_config.json",
"/path/to/tmp/json"
],
"name": "read filter exclusion spec",
@@ -253,7 +247,9 @@
"@@@STEP_TEXT@path: 'testing/buildbot/trybot_analyze_config.json'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"base\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"exclusions\": []@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"exclusions\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"f.*\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"chromium\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"exclusions\": []@@@",
@@ -269,41 +265,40 @@
"cmd": [
"python",
"-u",
- "[BUILDER_CACHE]/ios_simulator_swarming/src/build/gyp_chromium",
- "--analyzer",
- "{\"additional_compile_targets\": [\"All\", \"fake test\"], \"files\": [\"foo.cc\"], \"test_targets\": [\"fake test\"]}",
- "/path/to/tmp/json"
+ "import sys; sys.exit(0)"
],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=ios component=static_library fake gyp define 1='fake value 1' fake gyp define 2='fake value 2'"
- },
"name": "analyze",
"~followup_annotations": [
- "@@@STEP_TEXT@No compile necessary@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"compile_targets\": [], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"status\": \"No dependency\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"test_targets\": []@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
+ "@@@STEP_TEXT@Analyze disabled: matched exclusion@@@",
+ "@@@STEP_LOG_LINE@excluded_files@foo.cc (regex = 'f.*')@@@",
+ "@@@STEP_LOG_END@excluded_files@@@",
"@@@STEP_LOG_LINE@analyze_details@{@@@",
"@@@STEP_LOG_LINE@analyze_details@ \"additional_compile_targets\": [@@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"All\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"fake test\"@@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"All\"@@@",
+ "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"compile_targets\": [@@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"All\"@@@",
+ "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.compile_targets\": [@@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"All\"@@@",
"@@@STEP_LOG_LINE@analyze_details@ ], @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"compile_targets\": [], @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.compile_targets\": [], @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.test_targets\": [], @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"test_targets\": [@@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"fake test\"@@@",
- "@@@STEP_LOG_LINE@analyze_details@ ]@@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"test_targets\": []@@@",
"@@@STEP_LOG_LINE@analyze_details@}@@@",
"@@@STEP_LOG_END@analyze_details@@@"
]
},
{
+ "cmd": [
+ "ninja",
+ "-C",
+ "[BUILDER_CACHE]/ios_simulator/src/out/Debug-iphonesimulator",
+ "All"
+ ],
+ "cwd": "[BUILDER_CACHE]/ios_simulator/src/out/Debug-iphonesimulator",
+ "name": "compile (with patch)"
+ },
+ {
"cmd": [],
"name": "bootstrap swarming"
},
@@ -471,18 +466,6 @@
},
{
"cmd": [],
- "name": "skipped"
- },
- {
- "cmd": [],
- "name": "skipped.[skipped] fake test (fake device iOS 8.1)",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@This test was skipped because it was not affected.@@@"
- ]
- },
- {
- "cmd": [],
"name": "trigger"
},
{
« no previous file with comments | « scripts/slave/recipes/ios/try.expected/icu_patch.json ('k') | scripts/slave/recipes/ios/try.expected/parent.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698