| Index: scripts/slave/recipes/chromium_trybot.expected/trybot_mirrors_multiple_waterfall_bots.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/compile_because_of_analyze_matching_exclusion.json b/scripts/slave/recipes/chromium_trybot.expected/trybot_mirrors_multiple_waterfall_bots.json
|
| similarity index 96%
|
| copy from scripts/slave/recipes/chromium_trybot.expected/compile_because_of_analyze_matching_exclusion.json
|
| copy to scripts/slave/recipes/chromium_trybot.expected/trybot_mirrors_multiple_waterfall_bots.json
|
| index a6e4897b8458f4bcc14a3da6414ebd5371a288da..809cc38e48ae017097429d523082e5093d08c35e 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/compile_because_of_analyze_matching_exclusion.json
|
| +++ b/scripts/slave/recipes/chromium_trybot.expected/trybot_mirrors_multiple_waterfall_bots.json
|
| @@ -163,6 +163,28 @@
|
| },
|
| {
|
| "cmd": [
|
| + "python",
|
| + "-u",
|
| + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| + "[SLAVE_BUILD]/src/testing/buildbot/chromium.gpu.json",
|
| + "/path/to/tmp/json"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "read test spec (chromium.gpu)",
|
| + "~followup_annotations": [
|
| + "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.gpu.json@@@",
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"Fake Linux Release (NVIDIA)\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"base_unittests\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ ]@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| "killall",
|
| "-9",
|
| "gnome-keyring-daemon"
|
| @@ -228,6 +250,7 @@
|
| "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"compile_targets\": [@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"angle_unittests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"chromium_swarm_tests\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"content_gl_tests_run\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"gl_tests_run\", @@@",
|
| @@ -237,6 +260,7 @@
|
| "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.compile_targets\": [@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"angle_unittests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"chromium_swarm_tests\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"content_gl_tests_run\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"gl_tests_run\", @@@",
|
| @@ -246,6 +270,7 @@
|
| "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.test_targets\": [@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"angle_unittests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"content_gl_tests_run\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"gl_tests_run\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"gl_unittests_run\", @@@",
|
| @@ -254,6 +279,7 @@
|
| "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"test_targets\": [@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"angle_unittests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"content_gl_tests_run\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"gl_tests_run\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"gl_unittests_run\", @@@",
|
| @@ -328,6 +354,7 @@
|
| "--ninja-ensure-up-to-date",
|
| "--",
|
| "angle_unittests_run",
|
| + "base_unittests",
|
| "chromium_swarm_tests",
|
| "content_gl_tests_run",
|
| "gl_tests_run",
|
| @@ -1774,6 +1801,38 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "[SLAVE_BUILD]/src/infra/scripts/runtest_wrapper.py",
|
| + "--path-build",
|
| + "[BUILD]",
|
| + "--",
|
| + "--target",
|
| + "Release",
|
| + "--xvfb",
|
| + "--factory-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"linux_chromium_rel_ng\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.linux\", \"patch_project\": \"chromium\", \"patchset\": 1, \"path_config\": \"swarming\", \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--build-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"linux_chromium_rel_ng\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.linux\", \"patch_project\": \"chromium\", \"patchset\": 1, \"path_config\": \"swarming\", \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--annotate=gtest",
|
| + "--test-type=base_unittests",
|
| + "--step-name=base_unittests (with patch)",
|
| + "--test-launcher-summary-output",
|
| + "/path/to/tmp/json",
|
| + "--generate-json-file",
|
| + "-o",
|
| + "gtest-results/base_unittests",
|
| + "--builder-name=linux_chromium_rel_ng",
|
| + "--slave-name=TestSlavename",
|
| + "--build-number=571",
|
| + "base_unittests"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "base_unittests (with patch)"
|
| + },
|
| + {
|
| + "allow_subannotations": true,
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "RECIPE_MODULE[swarming]/resources/collect_gtest_task.py",
|
| "--swarming-client-dir",
|
| "[SLAVE_BUILD]/src/tools/swarming_client",
|
|
|