diff options
| author | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 07:52:11 +0000 |
|---|---|---|
| committer | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 07:52:11 +0000 |
| commit | 47573dc55d23b2ac1e210b20bae789cfaec976f5 (patch) | |
| tree | 0587bae40e76887b199e9c11c508d7d271b04c8a /views | |
| parent | bb042bddfda7dff97209bc34cb14194301496a14 (diff) | |
| download | chromium_src-47573dc55d23b2ac1e210b20bae789cfaec976f5.zip chromium_src-47573dc55d23b2ac1e210b20bae789cfaec976f5.tar.gz chromium_src-47573dc55d23b2ac1e210b20bae789cfaec976f5.tar.bz2 | |
Temporarily disable two tests in WidgetOwnershipTest on linux_chromeos build.
WidgetOwnershipTest.Ownership_ViewsNativeWidgetOwnsWidget
WidgetOwnershipTest.Ownership_ViewsNativeWidgetOwnsWidget_NativeDestroy
TBR=ben@chromium.org
BUG=104945
TEST=views_unittests passed
Review URL: http://codereview.chromium.org/8547006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110891 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/widget/widget_unittest.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/views/widget/widget_unittest.cc b/views/widget/widget_unittest.cc index 736d699..580bed8 100644 --- a/views/widget/widget_unittest.cc +++ b/views/widget/widget_unittest.cc @@ -554,7 +554,12 @@ TEST_F(WidgetOwnershipTest, Ownership_PlatformNativeWidgetOwnsWidget) { } // NativeWidget owns its Widget, part 2: NativeWidget is a NativeWidget. +#if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) +// Temporarily disable the test (http://crbug.com/104945). +TEST_F(WidgetOwnershipTest, DISABLED_Ownership_ViewsNativeWidgetOwnsWidget) { +#else TEST_F(WidgetOwnershipTest, Ownership_ViewsNativeWidgetOwnsWidget) { +#endif OwnershipTestState state; Widget* toplevel = CreateTopLevelPlatformWidget(); @@ -604,8 +609,14 @@ TEST_F(WidgetOwnershipTest, // NativeWidget owns its Widget, part 4: NativeWidget is a NativeWidget, // destroyed by the view hierarchy that contains it. +#if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) +// Temporarily disable the test (http://crbug.com/104945). +TEST_F(WidgetOwnershipTest, + DISABLED_Ownership_ViewsNativeWidgetOwnsWidget_NativeDestroy) { +#else TEST_F(WidgetOwnershipTest, Ownership_ViewsNativeWidgetOwnsWidget_NativeDestroy) { +#endif OwnershipTestState state; Widget* toplevel = CreateTopLevelPlatformWidget(); |