diff options
| author | msw <msw@chromium.org> | 2016-02-16 12:50:02 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-16 20:51:06 +0000 |
| commit | da0133e62a09b344202eea55f8a225bad2b9d51e (patch) | |
| tree | b29709f21c6ca544add4944f818cf085983753f4 /BUILD.gn | |
| parent | 878478b9060e9002114d62446519b8b2778f4c82 (diff) | |
| download | chromium_src-da0133e62a09b344202eea55f8a225bad2b9d51e.zip chromium_src-da0133e62a09b344202eea55f8a225bad2b9d51e.tar.gz chromium_src-da0133e62a09b344202eea55f8a225bad2b9d51e.tar.bz2 | |
Build ash_shell_with_content and run ash_unittests on Win bots.
Helps prevent regressions and supports development on win.
Disable hanging tests and some of DisplayManagerTestApi::UpdateDisplay.
TODO: Fix disabled tests, possibly related to crbug.com/247916
BUG=584038,247916
TEST=More bots successfully build/run ash_unittests and ash_shell_with_content.
R=sky@chromium.org
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/1693433004
Cr-Commit-Position: refs/heads/master@{#375657}
Diffstat (limited to 'BUILD.gn')
| -rw-r--r-- | BUILD.gn | 19 |
1 files changed, 8 insertions, 11 deletions
@@ -236,7 +236,14 @@ group("both_gn_and_gyp") { } if (use_aura) { - deps += [ "//ui/wm:wm_unittests" ] + deps += [ + "//ash:ash_shell_with_content", + "//ash:ash_unittests", + "//ui/aura:aura_unittests", + "//ui/aura:bench", + "//ui/aura:demo", + "//ui/wm:wm_unittests", + ] } if (use_ozone) { @@ -464,16 +471,6 @@ group("both_gn_and_gyp") { if (media_use_ffmpeg && !is_android) { deps += [ "//media:ffmpeg_regression_tests" ] } - - if (use_aura) { - deps += [ - "//ash:ash_shell_with_content", - "//ash:ash_unittests", - "//ui/aura:aura_unittests", - "//ui/aura:bench", - "//ui/aura:demo", - ] - } } if (is_android || (is_linux && !is_chromeos)) { |