Index: scripts/slave/recipes/chromium_trybot.expected/compile_because_of_analyze_with_filtered_tests.json |
diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_rel.json b/scripts/slave/recipes/chromium_trybot.expected/compile_because_of_analyze_with_filtered_tests.json |
similarity index 80% |
copy from scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_rel.json |
copy to scripts/slave/recipes/chromium_trybot.expected/compile_because_of_analyze_with_filtered_tests.json |
index 03bac7939333fd85e1aa278f7fd41f55cf8e1a0a..b6e399da5fed8fa7026163773d711505c9c0f83d 100644 |
--- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_rel.json |
+++ b/scripts/slave/recipes/chromium_trybot.expected/compile_because_of_analyze_with_filtered_tests.json |
@@ -76,35 +76,55 @@ |
"name": "read test spec", |
"~followup_annotations": [ |
"@@@STEP_TEXT@path: testing/buildbot/chromium_trybot.json@@@", |
- "@@@STEP_LOG_LINE@json.output@[@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"base_unittests\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"platforms\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"linux\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"mac\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ ], @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"mojo_common_unittests\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }, @@@", |
- "@@@STEP_LOG_LINE@json.output@ {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"args\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"--test-launcher-print-test-stdio=always\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ ], @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"chromium_configs\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"chromium_chromeos\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"chromium_chromeos_clang\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ ], @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"platforms\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"linux\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ ], @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"sandbox_linux_unittests\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }, @@@", |
- "@@@STEP_LOG_LINE@json.output@ {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"exclude_builders\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"tryserver.chromium.win:win_chromium_x64_rel\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ ], @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@]@@@", |
+ "@@@STEP_LOG_LINE@json.output@{@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"filter_tests_builders\": \"linux_chromium_rel\", @@@", |
+ "@@@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\": \"base_unittests\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@ }, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@ }, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"test\": \"unittests\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@ }@@@", |
+ "@@@STEP_LOG_LINE@json.output@ ]@@@", |
+ "@@@STEP_LOG_LINE@json.output@}@@@", |
+ "@@@STEP_LOG_END@json.output@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "git", |
+ "diff", |
+ "--cached", |
+ "--name-only" |
+ ], |
+ "cwd": "[SLAVE_BUILD]/src", |
+ "name": "git diff to analyze patch", |
+ "stdout": "/path/to/tmp/" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "[SLAVE_BUILD]/src/build/gyp_chromium", |
+ "--analyzer2", |
+ "{\"files\": [\"foo.cc\"], \"targets\": [\"base_unittests\", \"browser_tests\", \"unittests\"]}" |
+ ], |
+ "name": "analyze", |
+ "stdout": "/path/to/tmp/json", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@json.output@{@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"status\": \"Found dependency\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"targets\": [@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"browser_tests\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"base_unittests\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@ ]@@@", |
+ "@@@STEP_LOG_LINE@json.output@}@@@", |
"@@@STEP_LOG_END@json.output@@@" |
] |
}, |
@@ -140,7 +160,6 @@ |
"chrome", |
"chrome", |
"base_unittests", |
- "mojo_common_unittests", |
"browser_tests", |
"chrome" |
], |
@@ -307,30 +326,6 @@ |
"--build-properties", |
"{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.linux\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
"--annotate=gtest", |
- "--test-type=mojo_common_unittests", |
- "--test-launcher-summary-output", |
- "/path/to/tmp/json", |
- "--builder-name=linux_chromium_rel", |
- "--slave-name=TestSlavename", |
- "--build-number=571", |
- "mojo_common_unittests" |
- ], |
- "name": "mojo_common_unittests (with patch)" |
- }, |
- { |
- "allow_subannotations": true, |
- "cmd": [ |
- "python", |
- "-u", |
- "[BUILD]/scripts/slave/runtest.py", |
- "--target", |
- "Release", |
- "--xvfb", |
- "--factory-properties", |
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.linux\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
- "--build-properties", |
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.linux\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
- "--annotate=gtest", |
"--test-type=browser_tests", |
"--test-launcher-summary-output", |
"/path/to/tmp/json", |