diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-17 23:36:40 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-17 23:36:40 +0000 |
| commit | 6acf501cf2f370bf74586cb2b3601ea1d6a729e8 (patch) | |
| tree | 7615bf2a724cf747fb9bd775acdadf758b7b2288 /chrome/browser/bookmarks | |
| parent | 668ee4b57cb8060d6b63c98960a6f9a7b4ce968a (diff) | |
| download | chromium_src-6acf501cf2f370bf74586cb2b3601ea1d6a729e8.zip chromium_src-6acf501cf2f370bf74586cb2b3601ea1d6a729e8.tar.gz chromium_src-6acf501cf2f370bf74586cb2b3601ea1d6a729e8.tar.bz2 | |
Aura: unit_tests now run on Linux
Marked several tests DISABLED and several tests FAILS. Most are due to functionality that isn't implemented yet on Aura. Filed bugs with Feature-Aura for the ones we need to fix.
BUG=100352
TEST=unit_tests
Review URL: http://codereview.chromium.org/8298007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105962 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc | 9 | ||||
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_utils_unittest.cc | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc index 0189634..f20c648 100644 --- a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc @@ -288,7 +288,14 @@ TEST_F(BookmarkContextMenuControllerTest, EmptyNodesNullParent) { controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER)); } -TEST_F(BookmarkContextMenuControllerTest, CutCopyPasteNode) { +// Fails on Linux Aura, probably because clipboard isn't built yet. +// See http://crbug.com/100347 +#if defined(USE_AURA) && !defined(OS_WIN) +#define MAYBE_CutCopyPasteNode FAILS_CutCopyPasteNode +#else +#define MAYBE_CutCopyPasteNode CutCopyPasteNode +#endif +TEST_F(BookmarkContextMenuControllerTest, MAYBE_CutCopyPasteNode) { const BookmarkNode* bb_node = model_->bookmark_bar_node(); std::vector<const BookmarkNode*> nodes; nodes.push_back(bb_node->GetChild(0)); diff --git a/chrome/browser/bookmarks/bookmark_utils_unittest.cc b/chrome/browser/bookmarks/bookmark_utils_unittest.cc index 4eb78db..ae7ef24 100644 --- a/chrome/browser/bookmarks/bookmark_utils_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_utils_unittest.cc @@ -126,6 +126,9 @@ TEST(BookmarkUtilsTest, DoesBookmarkContainText) { // TODO(wyck): Functionality disabled on TOUCH_UI to work around clipboard hang // in http://crbug.com/96448 #define MAYBE_CopyPaste FAILS_CopyPaste +#elif defined(USE_AURA) && !defined(OS_WIN) +// Clipboard not yet implemented on Linux Aura, see http://crbug.com/100348 +#define MAYBE_CopyPaste FAILS_CopyPaste #else #define MAYBE_CopyPaste CopyPaste #endif |