diff options
| author | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 20:43:35 +0000 |
|---|---|---|
| committer | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 20:43:35 +0000 |
| commit | 683e08b6585ff4f98332a69660a7dd85047ae203 (patch) | |
| tree | a466121f70fc650a72643afef5d61d50834531de /ash/system | |
| parent | 969a95aab3b5da5aaea917742cf09a926a861302 (diff) | |
| download | chromium_src-683e08b6585ff4f98332a69660a7dd85047ae203.zip chromium_src-683e08b6585ff4f98332a69660a7dd85047ae203.tar.gz chromium_src-683e08b6585ff4f98332a69660a7dd85047ae203.tar.bz2 | |
Disable SystemTrayTestItems on OS_WIN
BUG=133045
TEST=ash_shell_unittests should pass on win_aura
Review URL: https://chromiumcodereview.appspot.com/10544184
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142469 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system')
| -rw-r--r-- | ash/system/tray/system_tray_unittest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ash/system/tray/system_tray_unittest.cc b/ash/system/tray/system_tray_unittest.cc index 1fde2c4..9bbb801 100644 --- a/ash/system/tray/system_tray_unittest.cc +++ b/ash/system/tray/system_tray_unittest.cc @@ -103,7 +103,14 @@ TEST_F(SystemTrayTest, SystemTrayDefaultView) { ASSERT_FALSE(tray->CloseBubbleForTest()); } -TEST_F(SystemTrayTest, SystemTrayTestItems) { +#if defined(OS_WIN) +// This test is crashing on windows. See http://crbug.com/127539. +#define MAYBE_SystemTrayTestItems DISABLED_SystemTrayTestItems +#else +#define MAYBE_SystemTrayTestItems SystemTrayTestItems +#endif + +TEST_F(SystemTrayTest, MAYBE_SystemTrayTestItems) { SystemTray* tray = GetSystemTray(); ASSERT_TRUE(tray->GetWidget()); |