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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/findit/chromium/test.expected/findit_consecutive_culprits.json

Issue 1946463003: [Findit] Change test.py recipe to speed up test try jobs(Recipe side change). (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: . Created 4 years, 7 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/findit/chromium/test.expected/all_test_failed.json ('k') | scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_first_sub_range.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/findit/chromium/test.expected/findit_consecutive_culprits.json
diff --git a/scripts/slave/recipes/findit/chromium/compile.expected/find_culprit_in_second_sub_range.json b/scripts/slave/recipes/findit/chromium/test.expected/findit_consecutive_culprits.json
similarity index 67%
copy from scripts/slave/recipes/findit/chromium/compile.expected/find_culprit_in_second_sub_range.json
copy to scripts/slave/recipes/findit/chromium/test.expected/findit_consecutive_culprits.json
index a4a7c754a2e922b3ef1872775f72eec90a7f06cc..bc2317cc6bec5848e671cd5877a82d3a5862b994 100644
--- a/scripts/slave/recipes/findit/chromium/compile.expected/find_culprit_in_second_sub_range.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/findit_consecutive_culprits.json
@@ -5,9 +5,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--master",
- "tryserver.chromium.linux",
+ "tryserver.chromium.mac",
"--builder",
- "linux_variable",
+ "mac_chromium_variable",
"--slave",
"build1-a1",
"--spec",
@@ -113,7 +113,7 @@
"-u",
"RECIPE_MODULE[build::cipd]/resources/bootstrap.py",
"--platform",
- "linux-amd64",
+ "mac-amd64",
"--dest-directory",
"[SLAVE_BUILD]/cipd",
"--json-output",
@@ -137,7 +137,7 @@
"--root",
"[CACHE]/cipd/goma",
"--list",
- "infra_internal/goma/client/linux-amd64 release",
+ "infra_internal/goma/client/mac-amd64 release",
"--json-output",
"/path/to/tmp/json",
"--service-account-json",
@@ -150,7 +150,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/linux-amd64\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/mac-amd64\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
@@ -179,9 +179,10 @@
],
"cwd": "[SLAVE_BUILD]/src",
"env": {
+ "FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
"GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1",
+ "GYP_DEFINES": "archive_gpu_tests=1 clang=1 component=static_library ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -200,7 +201,7 @@
"--paths",
"{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
"--properties",
- "{\"buildername\": \"linux_variable\", \"buildnumber\": \"1\", \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"build1-a1\", \"target_platform\": \"linux\"}"
+ "{\"buildername\": \"mac_chromium_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.mac\", \"slavename\": \"build1-a1\", \"target_platform\": \"mac\"}"
],
"name": "get compile targets for scripts",
"~followup_annotations": [
@@ -213,12 +214,12 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json",
+ "[SLAVE_BUILD]/src/testing/buildbot/chromium.mac.json",
"/path/to/tmp/json"
],
"name": "read test spec",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.mac.json@@@",
"@@@STEP_LOG_LINE@json.output@{}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -228,27 +229,24 @@
"git",
"log",
"--format=%H",
- "r1..r6"
+ "r0..r6"
],
"cwd": "[SLAVE_BUILD]/src",
"name": "git commits in range",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
+ "@@@STEP_LOG_LINE@revisions@r1@@@",
"@@@STEP_LOG_LINE@revisions@r2@@@",
"@@@STEP_LOG_LINE@revisions@r3@@@",
"@@@STEP_LOG_LINE@revisions@r4@@@",
"@@@STEP_LOG_LINE@revisions@r5@@@",
"@@@STEP_LOG_LINE@revisions@r6@@@",
- "@@@STEP_LOG_LINE@revisions@r7@@@",
- "@@@STEP_LOG_LINE@revisions@r8@@@",
- "@@@STEP_LOG_LINE@revisions@r9@@@",
- "@@@STEP_LOG_LINE@revisions@r10@@@",
"@@@STEP_LOG_END@revisions@@@"
]
},
{
"cmd": [],
- "name": "test r7"
+ "name": "test r2"
},
{
"cmd": [
@@ -256,9 +254,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--master",
- "tryserver.chromium.linux",
+ "tryserver.chromium.mac",
"--builder",
- "linux_variable",
+ "mac_chromium_variable",
"--slave",
"build1-a1",
"--spec",
@@ -272,20 +270,20 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src@r7",
+ "src@r2",
"--output_manifest"
],
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
- "name": "test r7.bot_update",
+ "name": "test r2.bot_update",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Some step text@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"r7\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src\": \"r2\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
@@ -357,7 +355,7 @@
},
{
"cmd": [],
- "name": "test r7.ensure_goma",
+ "name": "test r2.ensure_goma",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -368,13 +366,13 @@
"-u",
"RECIPE_MODULE[build::cipd]/resources/bootstrap.py",
"--platform",
- "linux-amd64",
+ "mac-amd64",
"--dest-directory",
"[SLAVE_BUILD]/cipd",
"--json-output",
"/path/to/tmp/json"
],
- "name": "test r7.ensure_goma.install cipd",
+ "name": "test r2.ensure_goma.install cipd",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
@@ -392,20 +390,20 @@
"--root",
"[CACHE]/cipd/goma",
"--list",
- "infra_internal/goma/client/linux-amd64 release",
+ "infra_internal/goma/client/mac-amd64 release",
"--json-output",
"/path/to/tmp/json",
"--service-account-json",
"/creds/service_accounts/service-account-goma-client.json"
],
- "name": "test r7.ensure_goma.ensure_installed",
+ "name": "test r2.ensure_goma.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/linux-amd64\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/mac-amd64\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
@@ -421,12 +419,13 @@
],
"cwd": "[SLAVE_BUILD]/src",
"env": {
+ "FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
"GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1",
+ "GYP_DEFINES": "archive_gpu_tests=1 clang=1 component=static_library ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
- "name": "test r7.gclient runhooks",
+ "name": "test r2.gclient runhooks",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -445,9 +444,9 @@
"--paths",
"{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
"--properties",
- "{\"buildername\": \"linux_variable\", \"buildnumber\": \"1\", \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"build1-a1\", \"target_platform\": \"linux\"}"
+ "{\"buildername\": \"mac_chromium_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.mac\", \"slavename\": \"build1-a1\", \"target_platform\": \"mac\"}"
],
- "name": "test r7.get compile targets for scripts",
+ "name": "test r2.get compile targets for scripts",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{}@@@",
@@ -459,14 +458,25 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json",
+ "[SLAVE_BUILD]/src/testing/buildbot/chromium.mac.json",
"/path/to/tmp/json"
],
- "name": "test r7.read test spec",
+ "name": "test r2.read test spec",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.mac.json@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"Mac10.9 Tests\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"test\": \"gl_tests\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
@@ -474,22 +484,12 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/mb/mb.py",
- "gen",
- "-m",
- "chromium.linux",
- "-b",
- "Linux Builder",
- "--config-file",
- "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
- "--goma-dir",
- "[CACHE]/cipd/goma",
- "//out/Release"
+ "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
+ "--show-path",
+ "python",
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "test r7.generate_build_files",
+ "name": "test r2.cleanup_temp",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -498,36 +498,12 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[build::findit]/resources/check_target_existence.py",
- "--target-build-dir",
+ "RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
+ "--build-dir",
"[SLAVE_BUILD]/src/out/Release",
- "--target",
- "target_name",
- "--json-output",
- "/path/to/tmp/json"
+ "--clean-isolated-files"
],
- "name": "test r7.check_targets",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"found\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"target_name\"@@@",
- "@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"not_found\": []@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
- ],
- "name": "test r7.cleanup_temp",
+ "name": "test r2.clean isolated files",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -539,21 +515,50 @@
"[SLAVE_BUILD]/src/tools/mb/mb.py",
"gen",
"-m",
- "chromium.linux",
+ "chromium.mac",
"-b",
- "Linux Builder",
+ "Mac Builder",
"--config-file",
"[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
"--goma-dir",
"[CACHE]/cipd/goma",
+ "--swarming-targets-file",
+ "gl_tests\n",
"//out/Release"
],
"env": {
+ "FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
- "name": "test r7.generate_build_files (2)",
+ "name": "test r2.generate_build_files",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@swarming-targets-file.txt@gl_tests@@@",
+ "@@@STEP_LOG_END@swarming-targets-file.txt@@@"
+ ]
+ },
+ {
+ "allow_subannotations": true,
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
+ "--src-dir",
+ "[SLAVE_BUILD]/src",
+ "--output-json",
+ "/path/to/tmp/json"
+ ],
+ "env": {
+ "FORCE_MAC_TOOLCHAIN": "1",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
+ "name": "test r2.clang_revision",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"clang_revision\": \"123456-7\"@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
]
},
{
@@ -577,7 +582,7 @@
"--build-tool",
"ninja",
"--compiler",
- "goma",
+ "goma-clang",
"--goma-jsonstatus",
"/path/to/tmp/json",
"--goma-service-account-json-file",
@@ -586,20 +591,192 @@
"[CACHE]/cipd/goma",
"--ninja-ensure-up-to-date",
"--",
- "target_name"
+ "gl_tests",
+ "gl_tests_run"
],
"env": {
+ "FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
- "name": "test r7.compile",
+ "name": "test r2.compile",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "step returned non-zero exit code: 1",
"@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
- "@@@STEP_LOG_END@json.output (invalid)@@@",
- "@@@STEP_LOG_LINE@exception@TypeError(\"'NoneType' object has no attribute '__getitem__'\",)@@@",
- "@@@STEP_LOG_END@exception@@@",
- "@@@STEP_WARNINGS@@@"
+ "@@@STEP_LOG_END@json.output (invalid)@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[build::isolate]/resources/remove_build_metadata.py",
+ "--build-dir",
+ "[SLAVE_BUILD]/src/out/Release",
+ "--src-dir",
+ "[SLAVE_BUILD]/src"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "test r2.remove_build_metadata",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[build::isolate]/resources/isolate.py",
+ "[SLAVE_BUILD]/src/tools/swarming_client",
+ "batcharchive",
+ "--dump-json",
+ "/path/to/tmp/json",
+ "--isolate-server",
+ "https://isolateserver.appspot.com",
+ "--verbose",
+ "[SLAVE_BUILD]/src/out/Release/gl_tests.isolated.gen.json"
+ ],
+ "name": "test r2.isolate tests",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"gl_tests\": \"[dummy hash for gl_tests]\"@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "trigger",
+ "--swarming",
+ "https://chromium-swarm.appspot.com",
+ "--isolate-server",
+ "https://isolateserver.appspot.com",
+ "--priority",
+ "25",
+ "--shards",
+ "1",
+ "--task-name",
+ "gl_tests (r2)/Mac-10.9/[dummy has/mac_chromium_variable/1",
+ "--dump-json",
+ "/path/to/tmp/json",
+ "--expiration",
+ "3600",
+ "--io-timeout",
+ "1200",
+ "--hard-timeout",
+ "3600",
+ "--dimension",
+ "cpu",
+ "x86-64",
+ "--dimension",
+ "gpu",
+ "none",
+ "--dimension",
+ "os",
+ "Mac-10.9",
+ "--dimension",
+ "pool",
+ "Chrome",
+ "--tag",
+ "buildername:mac_chromium_variable",
+ "--tag",
+ "buildnumber:1",
+ "--tag",
+ "data:[dummy hash for gl_tests]",
+ "--tag",
+ "master:tryserver.chromium.mac",
+ "--tag",
+ "name:gl_tests",
+ "--tag",
+ "os:Mac-10.9",
+ "--tag",
+ "project:chromium",
+ "--tag",
+ "purpose:CI",
+ "--tag",
+ "purpose:post-commit",
+ "--tag",
+ "slavename:build1-a1",
+ "--tag",
+ "stepname:gl_tests (r2) on Mac-10.9",
+ "--idempotent",
+ "[dummy hash for gl_tests]",
+ "--",
+ "--gtest_filter=Test.One",
+ "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
+ ],
+ "name": "test r2.[trigger] gl_tests (r2) on Mac-10.9",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"gl_tests (r2)/Mac-10.9/[dummy has/mac_chromium_variable/1\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"gl_tests (r2)/Mac-10.9/[dummy has/mac_chromium_variable/1\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@"
+ ]
+ },
+ {
+ "allow_subannotations": true,
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
+ "python",
+ "RECIPE_MODULE[build::swarming]/resources/collect_gtest_task.py",
+ "--swarming-client-dir",
+ "[SLAVE_BUILD]/src/tools/swarming_client",
+ "--temp-root-dir",
+ "[TMP_BASE]",
+ "--merged-test-output",
+ "/path/to/tmp/json",
+ "--",
+ "collect",
+ "--swarming",
+ "https://chromium-swarm.appspot.com",
+ "--decorate",
+ "--print-status-updates",
+ "--shards",
+ "1",
+ "gl_tests (r2)/Mac-10.9/[dummy has/mac_chromium_variable/1"
+ ],
+ "name": "test r2.gl_tests (r2) on Mac-10.9",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[build::test_results]/resources/upload_gtest_test_results.py",
+ "--input-gtest-json",
+ "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}]}]}",
+ "--master-name",
+ "tryserver.chromium.mac",
+ "--builder-name",
+ "mac_chromium_variable",
+ "--build-number",
+ "1",
+ "--test-type",
+ "test r2.gl_tests (r2) on Mac-10.9",
+ "--test-results-server",
+ "test-results.appspot.com",
+ "--chrome-revision",
+ "170242"
+ ],
+ "name": "test r2.Upload to test-results [test r2.gl_tests (r2) on Mac-10.9]",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -612,9 +789,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--master",
- "tryserver.chromium.linux",
+ "tryserver.chromium.mac",
"--builder",
- "linux_variable",
+ "mac_chromium_variable",
"--slave",
"build1-a1",
"--spec",
@@ -724,7 +901,7 @@
"-u",
"RECIPE_MODULE[build::cipd]/resources/bootstrap.py",
"--platform",
- "linux-amd64",
+ "mac-amd64",
"--dest-directory",
"[SLAVE_BUILD]/cipd",
"--json-output",
@@ -748,7 +925,7 @@
"--root",
"[CACHE]/cipd/goma",
"--list",
- "infra_internal/goma/client/linux-amd64 release",
+ "infra_internal/goma/client/mac-amd64 release",
"--json-output",
"/path/to/tmp/json",
"--service-account-json",
@@ -761,7 +938,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/linux-amd64\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/mac-amd64\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
@@ -777,9 +954,10 @@
],
"cwd": "[SLAVE_BUILD]/src",
"env": {
+ "FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
"GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1",
+ "GYP_DEFINES": "archive_gpu_tests=1 clang=1 component=static_library ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "test r3.gclient runhooks",
@@ -801,7 +979,7 @@
"--paths",
"{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
"--properties",
- "{\"buildername\": \"linux_variable\", \"buildnumber\": \"1\", \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"build1-a1\", \"target_platform\": \"linux\"}"
+ "{\"buildername\": \"mac_chromium_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.mac\", \"slavename\": \"build1-a1\", \"target_platform\": \"mac\"}"
],
"name": "test r3.get compile targets for scripts",
"~followup_annotations": [
@@ -815,14 +993,25 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json",
+ "[SLAVE_BUILD]/src/testing/buildbot/chromium.mac.json",
"/path/to/tmp/json"
],
"name": "test r3.read test spec",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.mac.json@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"Mac10.9 Tests\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"test\": \"gl_tests\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
@@ -830,22 +1019,12 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/mb/mb.py",
- "gen",
- "-m",
- "chromium.linux",
- "-b",
- "Linux Builder",
- "--config-file",
- "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
- "--goma-dir",
- "[CACHE]/cipd/goma",
- "//out/Release"
+ "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
+ "--show-path",
+ "python",
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "test r3.generate_build_files",
+ "name": "test r3.cleanup_temp",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -854,36 +1033,12 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[build::findit]/resources/check_target_existence.py",
- "--target-build-dir",
+ "RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
+ "--build-dir",
"[SLAVE_BUILD]/src/out/Release",
- "--target",
- "target_name",
- "--json-output",
- "/path/to/tmp/json"
+ "--clean-isolated-files"
],
- "name": "test r3.check_targets",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"found\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"target_name\"@@@",
- "@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"not_found\": []@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
- ],
- "name": "test r3.cleanup_temp",
+ "name": "test r3.clean isolated files",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -895,21 +1050,50 @@
"[SLAVE_BUILD]/src/tools/mb/mb.py",
"gen",
"-m",
- "chromium.linux",
+ "chromium.mac",
"-b",
- "Linux Builder",
+ "Mac Builder",
"--config-file",
"[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
"--goma-dir",
"[CACHE]/cipd/goma",
+ "--swarming-targets-file",
+ "gl_tests\n",
"//out/Release"
],
"env": {
+ "FORCE_MAC_TOOLCHAIN": "1",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
+ "name": "test r3.generate_build_files",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@swarming-targets-file.txt@gl_tests@@@",
+ "@@@STEP_LOG_END@swarming-targets-file.txt@@@"
+ ]
+ },
+ {
+ "allow_subannotations": true,
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
+ "--src-dir",
+ "[SLAVE_BUILD]/src",
+ "--output-json",
+ "/path/to/tmp/json"
+ ],
+ "env": {
+ "FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
- "name": "test r3.generate_build_files (2)",
+ "name": "test r3.clang_revision",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"clang_revision\": \"123456-7\"@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
]
},
{
@@ -933,7 +1117,7 @@
"--build-tool",
"ninja",
"--compiler",
- "goma",
+ "goma-clang",
"--goma-jsonstatus",
"/path/to/tmp/json",
"--goma-service-account-json-file",
@@ -942,9 +1126,11 @@
"[CACHE]/cipd/goma",
"--ninja-ensure-up-to-date",
"--",
- "target_name"
+ "gl_tests",
+ "gl_tests_run"
],
"env": {
+ "FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
"name": "test r3.compile",
@@ -955,6 +1141,180 @@
]
},
{
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[build::isolate]/resources/remove_build_metadata.py",
+ "--build-dir",
+ "[SLAVE_BUILD]/src/out/Release",
+ "--src-dir",
+ "[SLAVE_BUILD]/src"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "test r3.remove_build_metadata",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[build::isolate]/resources/isolate.py",
+ "[SLAVE_BUILD]/src/tools/swarming_client",
+ "batcharchive",
+ "--dump-json",
+ "/path/to/tmp/json",
+ "--isolate-server",
+ "https://isolateserver.appspot.com",
+ "--verbose",
+ "[SLAVE_BUILD]/src/out/Release/gl_tests.isolated.gen.json"
+ ],
+ "name": "test r3.isolate tests",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"gl_tests\": \"[dummy hash for gl_tests]\"@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "trigger",
+ "--swarming",
+ "https://chromium-swarm.appspot.com",
+ "--isolate-server",
+ "https://isolateserver.appspot.com",
+ "--priority",
+ "25",
+ "--shards",
+ "1",
+ "--task-name",
+ "gl_tests (r3)/Mac-10.9/[dummy has/mac_chromium_variable/1",
+ "--dump-json",
+ "/path/to/tmp/json",
+ "--expiration",
+ "3600",
+ "--io-timeout",
+ "1200",
+ "--hard-timeout",
+ "3600",
+ "--dimension",
+ "cpu",
+ "x86-64",
+ "--dimension",
+ "gpu",
+ "none",
+ "--dimension",
+ "os",
+ "Mac-10.9",
+ "--dimension",
+ "pool",
+ "Chrome",
+ "--tag",
+ "buildername:mac_chromium_variable",
+ "--tag",
+ "buildnumber:1",
+ "--tag",
+ "data:[dummy hash for gl_tests]",
+ "--tag",
+ "master:tryserver.chromium.mac",
+ "--tag",
+ "name:gl_tests",
+ "--tag",
+ "os:Mac-10.9",
+ "--tag",
+ "project:chromium",
+ "--tag",
+ "purpose:CI",
+ "--tag",
+ "purpose:post-commit",
+ "--tag",
+ "slavename:build1-a1",
+ "--tag",
+ "stepname:gl_tests (r3) on Mac-10.9",
+ "--idempotent",
+ "[dummy hash for gl_tests]",
+ "--",
+ "--gtest_filter=Test.One",
+ "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
+ ],
+ "name": "test r3.[trigger] gl_tests (r3) on Mac-10.9",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"gl_tests (r3)/Mac-10.9/[dummy has/mac_chromium_variable/1\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"gl_tests (r3)/Mac-10.9/[dummy has/mac_chromium_variable/1\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@"
+ ]
+ },
+ {
+ "allow_subannotations": true,
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
+ "python",
+ "RECIPE_MODULE[build::swarming]/resources/collect_gtest_task.py",
+ "--swarming-client-dir",
+ "[SLAVE_BUILD]/src/tools/swarming_client",
+ "--temp-root-dir",
+ "[TMP_BASE]",
+ "--merged-test-output",
+ "/path/to/tmp/json",
+ "--",
+ "collect",
+ "--swarming",
+ "https://chromium-swarm.appspot.com",
+ "--decorate",
+ "--print-status-updates",
+ "--shards",
+ "1",
+ "gl_tests (r3)/Mac-10.9/[dummy has/mac_chromium_variable/1"
+ ],
+ "name": "test r3.gl_tests (r3) on Mac-10.9",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[build::test_results]/resources/upload_gtest_test_results.py",
+ "--input-gtest-json",
+ "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}]}]}",
+ "--master-name",
+ "tryserver.chromium.mac",
+ "--builder-name",
+ "mac_chromium_variable",
+ "--build-number",
+ "1",
+ "--test-type",
+ "test r3.gl_tests (r3) on Mac-10.9",
+ "--test-results-server",
+ "test-results.appspot.com",
+ "--chrome-revision",
+ "170242"
+ ],
+ "name": "test r3.Upload to test-results [test r3.gl_tests (r3) on Mac-10.9]",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"cmd": [],
"name": "test r4"
},
@@ -964,9 +1324,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--master",
- "tryserver.chromium.linux",
+ "tryserver.chromium.mac",
"--builder",
- "linux_variable",
+ "mac_chromium_variable",
"--slave",
"build1-a1",
"--spec",
@@ -1076,7 +1436,7 @@
"-u",
"RECIPE_MODULE[build::cipd]/resources/bootstrap.py",
"--platform",
- "linux-amd64",
+ "mac-amd64",
"--dest-directory",
"[SLAVE_BUILD]/cipd",
"--json-output",
@@ -1100,7 +1460,7 @@
"--root",
"[CACHE]/cipd/goma",
"--list",
- "infra_internal/goma/client/linux-amd64 release",
+ "infra_internal/goma/client/mac-amd64 release",
"--json-output",
"/path/to/tmp/json",
"--service-account-json",
@@ -1113,7 +1473,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/linux-amd64\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/mac-amd64\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
@@ -1129,9 +1489,10 @@
],
"cwd": "[SLAVE_BUILD]/src",
"env": {
+ "FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
"GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1",
+ "GYP_DEFINES": "archive_gpu_tests=1 clang=1 component=static_library ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "test r4.gclient runhooks",
@@ -1153,7 +1514,7 @@
"--paths",
"{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
"--properties",
- "{\"buildername\": \"linux_variable\", \"buildnumber\": \"1\", \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"build1-a1\", \"target_platform\": \"linux\"}"
+ "{\"buildername\": \"mac_chromium_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.mac\", \"slavename\": \"build1-a1\", \"target_platform\": \"mac\"}"
],
"name": "test r4.get compile targets for scripts",
"~followup_annotations": [
@@ -1167,14 +1528,25 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json",
+ "[SLAVE_BUILD]/src/testing/buildbot/chromium.mac.json",
"/path/to/tmp/json"
],
"name": "test r4.read test spec",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.mac.json@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"Mac10.9 Tests\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"test\": \"gl_tests\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
@@ -1182,22 +1554,12 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/mb/mb.py",
- "gen",
- "-m",
- "chromium.linux",
- "-b",
- "Linux Builder",
- "--config-file",
- "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
- "--goma-dir",
- "[CACHE]/cipd/goma",
- "//out/Release"
+ "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
+ "--show-path",
+ "python",
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "test r4.generate_build_files",
+ "name": "test r4.cleanup_temp",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1206,36 +1568,12 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[build::findit]/resources/check_target_existence.py",
- "--target-build-dir",
+ "RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
+ "--build-dir",
"[SLAVE_BUILD]/src/out/Release",
- "--target",
- "target_name",
- "--json-output",
- "/path/to/tmp/json"
+ "--clean-isolated-files"
],
- "name": "test r4.check_targets",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"found\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"target_name\"@@@",
- "@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"not_found\": []@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
- ],
- "name": "test r4.cleanup_temp",
+ "name": "test r4.clean isolated files",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1247,21 +1585,50 @@
"[SLAVE_BUILD]/src/tools/mb/mb.py",
"gen",
"-m",
- "chromium.linux",
+ "chromium.mac",
"-b",
- "Linux Builder",
+ "Mac Builder",
"--config-file",
"[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
"--goma-dir",
"[CACHE]/cipd/goma",
+ "--swarming-targets-file",
+ "gl_tests\n",
"//out/Release"
],
"env": {
+ "FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
- "name": "test r4.generate_build_files (2)",
+ "name": "test r4.generate_build_files",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@swarming-targets-file.txt@gl_tests@@@",
+ "@@@STEP_LOG_END@swarming-targets-file.txt@@@"
+ ]
+ },
+ {
+ "allow_subannotations": true,
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
+ "--src-dir",
+ "[SLAVE_BUILD]/src",
+ "--output-json",
+ "/path/to/tmp/json"
+ ],
+ "env": {
+ "FORCE_MAC_TOOLCHAIN": "1",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
+ "name": "test r4.clang_revision",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"clang_revision\": \"123456-7\"@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
]
},
{
@@ -1285,7 +1652,7 @@
"--build-tool",
"ninja",
"--compiler",
- "goma",
+ "goma-clang",
"--goma-jsonstatus",
"/path/to/tmp/json",
"--goma-service-account-json-file",
@@ -1294,20 +1661,195 @@
"[CACHE]/cipd/goma",
"--ninja-ensure-up-to-date",
"--",
- "target_name"
+ "gl_tests",
+ "gl_tests_run"
],
"env": {
+ "FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
"name": "test r4.compile",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "step returned non-zero exit code: 1",
"@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
- "@@@STEP_LOG_END@json.output (invalid)@@@",
- "@@@STEP_LOG_LINE@exception@TypeError(\"'NoneType' object has no attribute '__getitem__'\",)@@@",
- "@@@STEP_LOG_END@exception@@@",
- "@@@STEP_WARNINGS@@@"
+ "@@@STEP_LOG_END@json.output (invalid)@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[build::isolate]/resources/remove_build_metadata.py",
+ "--build-dir",
+ "[SLAVE_BUILD]/src/out/Release",
+ "--src-dir",
+ "[SLAVE_BUILD]/src"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "test r4.remove_build_metadata",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[build::isolate]/resources/isolate.py",
+ "[SLAVE_BUILD]/src/tools/swarming_client",
+ "batcharchive",
+ "--dump-json",
+ "/path/to/tmp/json",
+ "--isolate-server",
+ "https://isolateserver.appspot.com",
+ "--verbose",
+ "[SLAVE_BUILD]/src/out/Release/gl_tests.isolated.gen.json"
+ ],
+ "name": "test r4.isolate tests",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"gl_tests\": \"[dummy hash for gl_tests]\"@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "trigger",
+ "--swarming",
+ "https://chromium-swarm.appspot.com",
+ "--isolate-server",
+ "https://isolateserver.appspot.com",
+ "--priority",
+ "25",
+ "--shards",
+ "1",
+ "--task-name",
+ "gl_tests (r4)/Mac-10.9/[dummy has/mac_chromium_variable/1",
+ "--dump-json",
+ "/path/to/tmp/json",
+ "--expiration",
+ "3600",
+ "--io-timeout",
+ "1200",
+ "--hard-timeout",
+ "3600",
+ "--dimension",
+ "cpu",
+ "x86-64",
+ "--dimension",
+ "gpu",
+ "none",
+ "--dimension",
+ "os",
+ "Mac-10.9",
+ "--dimension",
+ "pool",
+ "Chrome",
+ "--tag",
+ "buildername:mac_chromium_variable",
+ "--tag",
+ "buildnumber:1",
+ "--tag",
+ "data:[dummy hash for gl_tests]",
+ "--tag",
+ "master:tryserver.chromium.mac",
+ "--tag",
+ "name:gl_tests",
+ "--tag",
+ "os:Mac-10.9",
+ "--tag",
+ "project:chromium",
+ "--tag",
+ "purpose:CI",
+ "--tag",
+ "purpose:post-commit",
+ "--tag",
+ "slavename:build1-a1",
+ "--tag",
+ "stepname:gl_tests (r4) on Mac-10.9",
+ "--idempotent",
+ "[dummy hash for gl_tests]",
+ "--",
+ "--gtest_filter=Test.One",
+ "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
+ ],
+ "name": "test r4.[trigger] gl_tests (r4) on Mac-10.9",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"gl_tests (r4)/Mac-10.9/[dummy has/mac_chromium_variable/1\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"gl_tests (r4)/Mac-10.9/[dummy has/mac_chromium_variable/1\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@"
+ ]
+ },
+ {
+ "allow_subannotations": true,
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
+ "python",
+ "RECIPE_MODULE[build::swarming]/resources/collect_gtest_task.py",
+ "--swarming-client-dir",
+ "[SLAVE_BUILD]/src/tools/swarming_client",
+ "--temp-root-dir",
+ "[TMP_BASE]",
+ "--merged-test-output",
+ "/path/to/tmp/json",
+ "--",
+ "collect",
+ "--swarming",
+ "https://chromium-swarm.appspot.com",
+ "--decorate",
+ "--print-status-updates",
+ "--shards",
+ "1",
+ "gl_tests (r4)/Mac-10.9/[dummy has/mac_chromium_variable/1"
+ ],
+ "name": "test r4.gl_tests (r4) on Mac-10.9",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "step returned non-zero exit code: 1",
+ "@@@STEP_TEXT@<br/>failures:<br/>Test.One<br/>@@@",
+ "@@@STEP_FAILURE@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[build::test_results]/resources/upload_gtest_test_results.py",
+ "--input-gtest-json",
+ "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"FAILURE\"}]}]}",
+ "--master-name",
+ "tryserver.chromium.mac",
+ "--builder-name",
+ "mac_chromium_variable",
+ "--build-number",
+ "1",
+ "--test-type",
+ "test r4.gl_tests (r4) on Mac-10.9",
+ "--test-results-server",
+ "test-results.appspot.com",
+ "--chrome-revision",
+ "170242"
+ ],
+ "name": "test r4.Upload to test-results [test r4.gl_tests (r4) on Mac-10.9]",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -1318,39 +1860,41 @@
],
"name": "report",
"~followup_annotations": [
- "@@@STEP_TEXT@<br/>Culprit: <a href=\"https://crrev.com/r4\">r4</a>@@@",
"@@@STEP_LOG_LINE@report@{@@@",
+ "@@@STEP_LOG_LINE@report@ \"culprits\": {@@@",
+ "@@@STEP_LOG_LINE@report@ \"gl_tests\": {@@@",
+ "@@@STEP_LOG_LINE@report@ \"Test.One\": \"r4\"@@@",
+ "@@@STEP_LOG_LINE@report@ }@@@",
+ "@@@STEP_LOG_LINE@report@ }, @@@",
"@@@STEP_LOG_LINE@report@ \"result\": {@@@",
- "@@@STEP_LOG_LINE@report@ \"r4\": \"failed\", @@@",
- "@@@STEP_LOG_LINE@report@ \"r7\": \"failed\", @@@",
- "@@@STEP_LOG_LINE@report@ \"r3\": \"passed\"@@@",
+ "@@@STEP_LOG_LINE@report@ \"r4\": {@@@",
+ "@@@STEP_LOG_LINE@report@ \"gl_tests\": {@@@",
+ "@@@STEP_LOG_LINE@report@ \"status\": \"failed\", @@@",
+ "@@@STEP_LOG_LINE@report@ \"failures\": [@@@",
+ "@@@STEP_LOG_LINE@report@ \"Test.One\"@@@",
+ "@@@STEP_LOG_LINE@report@ ], @@@",
+ "@@@STEP_LOG_LINE@report@ \"valid\": true@@@",
+ "@@@STEP_LOG_LINE@report@ }@@@",
+ "@@@STEP_LOG_LINE@report@ }, @@@",
+ "@@@STEP_LOG_LINE@report@ \"r2\": {@@@",
+ "@@@STEP_LOG_LINE@report@ \"gl_tests\": {@@@",
+ "@@@STEP_LOG_LINE@report@ \"status\": \"passed\", @@@",
+ "@@@STEP_LOG_LINE@report@ \"valid\": true@@@",
+ "@@@STEP_LOG_LINE@report@ }@@@",
+ "@@@STEP_LOG_LINE@report@ }, @@@",
+ "@@@STEP_LOG_LINE@report@ \"r3\": {@@@",
+ "@@@STEP_LOG_LINE@report@ \"gl_tests\": {@@@",
+ "@@@STEP_LOG_LINE@report@ \"status\": \"passed\", @@@",
+ "@@@STEP_LOG_LINE@report@ \"valid\": true@@@",
+ "@@@STEP_LOG_LINE@report@ }@@@",
+ "@@@STEP_LOG_LINE@report@ }@@@",
"@@@STEP_LOG_LINE@report@ }, @@@",
- "@@@STEP_LOG_LINE@report@ \"culprit\": \"r4\", @@@",
"@@@STEP_LOG_LINE@report@ \"metadata\": {@@@",
- "@@@STEP_LOG_LINE@report@ \"use_bisect\": false, @@@",
- "@@@STEP_LOG_LINE@report@ \"regression_range_size\": 9, @@@",
- "@@@STEP_LOG_LINE@report@ \"sub_ranges\": [@@@",
- "@@@STEP_LOG_LINE@report@ [@@@",
- "@@@STEP_LOG_LINE@report@ \"r7\", @@@",
- "@@@STEP_LOG_LINE@report@ \"r8\", @@@",
- "@@@STEP_LOG_LINE@report@ \"r9\", @@@",
- "@@@STEP_LOG_LINE@report@ \"r10\"@@@",
- "@@@STEP_LOG_LINE@report@ ], @@@",
- "@@@STEP_LOG_LINE@report@ [@@@",
- "@@@STEP_LOG_LINE@report@ \"r3\", @@@",
- "@@@STEP_LOG_LINE@report@ \"r4\", @@@",
- "@@@STEP_LOG_LINE@report@ \"r5\", @@@",
- "@@@STEP_LOG_LINE@report@ \"r6\"@@@",
- "@@@STEP_LOG_LINE@report@ ], @@@",
- "@@@STEP_LOG_LINE@report@ [@@@",
- "@@@STEP_LOG_LINE@report@ null, @@@",
- "@@@STEP_LOG_LINE@report@ \"r2\"@@@",
- "@@@STEP_LOG_LINE@report@ ]@@@",
- "@@@STEP_LOG_LINE@report@ ]@@@",
+ "@@@STEP_LOG_LINE@report@ \"regression_range_size\": 6@@@",
"@@@STEP_LOG_LINE@report@ }@@@",
"@@@STEP_LOG_LINE@report@}@@@",
"@@@STEP_LOG_END@report@@@",
- "@@@SET_BUILD_PROPERTY@report@{\"culprit\": \"r4\", \"metadata\": {\"regression_range_size\": 9, \"sub_ranges\": [[\"r7\", \"r8\", \"r9\", \"r10\"], [\"r3\", \"r4\", \"r5\", \"r6\"], [null, \"r2\"]], \"use_bisect\": false}, \"result\": {\"r3\": \"passed\", \"r4\": \"failed\", \"r7\": \"failed\"}}@@@"
+ "@@@SET_BUILD_PROPERTY@report@{\"culprits\": {\"gl_tests\": {\"Test.One\": \"r4\"}}, \"metadata\": {\"regression_range_size\": 6}, \"result\": {\"r2\": {\"gl_tests\": {\"status\": \"passed\", \"valid\": true}}, \"r3\": {\"gl_tests\": {\"status\": \"passed\", \"valid\": true}}, \"r4\": {\"gl_tests\": {\"failures\": [\"Test.One\"], \"status\": \"failed\", \"valid\": true}}}}@@@"
]
},
{
« no previous file with comments | « scripts/slave/recipes/findit/chromium/test.expected/all_test_failed.json ('k') | scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_first_sub_range.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698