diff options
| author | jsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-22 23:33:53 +0000 |
|---|---|---|
| committer | jsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-22 23:33:53 +0000 |
| commit | bf43a38e0102bd5c28e9a2dae39418c2565cd883 (patch) | |
| tree | ed408ccf9a710b45e33059b49f476ba23f87178d | |
| parent | ddf061b28bb37a60b58868bdff749d7fa0dfd49f (diff) | |
| download | chromium_src-bf43a38e0102bd5c28e9a2dae39418c2565cd883.zip chromium_src-bf43a38e0102bd5c28e9a2dae39418c2565cd883.tar.gz chromium_src-bf43a38e0102bd5c28e9a2dae39418c2565cd883.tar.bz2 | |
Disable tests broken by WK r118001
BUG=129235
R=vandebo@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10414060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138395 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/browser_keyevents_browsertest.cc | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc index 33f2580..a9703a0 100644 --- a/chrome/browser/browser_keyevents_browsertest.cc +++ b/chrome/browser/browser_keyevents_browsertest.cc @@ -292,11 +292,15 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { #if defined(OS_MACOSX) // http://crbug.com/81451 -IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_NormalKeyEvents) { +#define MAYBE_NormalKeyEvents DISABLED_NormalKeyEvents +#elif defined(OS_LINUX) +// http://crbug.com/129235 +#define MAYBE_NormalKeyEvents FAILS_NormalKeyEvents #else -IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, NormalKeyEvents) { +#define MAYBE_NormalKeyEvents NormalKeyEvents #endif +IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_NormalKeyEvents) { static const KeyEventTestData kTestNoInput[] = { // a { ui::VKEY_A, false, false, false, false, @@ -392,7 +396,15 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, NormalKeyEvents) { } #if defined(OS_WIN) || defined(OS_LINUX) -IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, CtrlKeyEvents) { + +#if defined(OS_LINUX) +// http://crbug.com/129235 +#define MAYBE_CtrlKeyEvents FAILS_CtrlKeyEvents +#else +#define MAYBE_CtrlKeyEvents CtrlKeyEvents +#endif + +IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_CtrlKeyEvents) { static const KeyEventTestData kTestCtrlF = { ui::VKEY_F, true, false, false, false, false, false, false, false, 2, @@ -514,10 +526,15 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_CommandKeyEvents) { #if defined(OS_MACOSX) // http://crbug.com/81451 for mac -IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_AccessKeys) { +#define MAYBE_AccessKeys DISABLED_AccessKeys +#elif defined(OS_LINUX) +// http://crbug.com/129235 +#define MAYBE_AccessKeys FAILS_AccessKeys #else -IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, AccessKeys) { +#define MAYBE_AccessKeys AccessKeys #endif + +IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_AccessKeys) { #if defined(OS_MACOSX) // On Mac, access keys use ctrl+alt modifiers. static const KeyEventTestData kTestAccessA = { |