diff options
| author | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 17:51:34 +0000 |
|---|---|---|
| committer | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 17:51:34 +0000 |
| commit | e62768fec279649b786e1fe6f42a898cdc84914b (patch) | |
| tree | a1bcffbd5b3305a6d6e90c9a68ef27aa6ca725be | |
| parent | c30bcce5bcaac902a63146da6151494b832bac13 (diff) | |
| download | chromium_src-e62768fec279649b786e1fe6f42a898cdc84914b.zip chromium_src-e62768fec279649b786e1fe6f42a898cdc84914b.tar.gz chromium_src-e62768fec279649b786e1fe6f42a898cdc84914b.tar.bz2 | |
Disable failing ui_tests on Linux:
PPAPINaClTest.CursorControl
OutOfProcessPPAPITest.FlashFullscreen
BUG=108180
TEST=none
TBR=brettw
Review URL: http://codereview.chromium.org/9006014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115146 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/ui/ppapi_uitest.cc | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc index f69f075..dd02f00 100644 --- a/chrome/test/ui/ppapi_uitest.cc +++ b/chrome/test/ui/ppapi_uitest.cc @@ -282,9 +282,16 @@ TEST_PPAPI_OUT_OF_PROCESS(Broker) TEST_PPAPI_IN_PROCESS(Core) TEST_PPAPI_OUT_OF_PROCESS(Core) -TEST_PPAPI_IN_PROCESS(CursorControl) -TEST_PPAPI_OUT_OF_PROCESS(CursorControl) -TEST_PPAPI_NACL_VIA_HTTP(CursorControl) +// Times out on Linux. http://crbug.com/108180 +#if defined(OS_LINUX) +#define MAYBE_CursorControl DISABLED_CursorControl +#else +#define MAYBE_CursorControl CursorControl +#endif + +TEST_PPAPI_IN_PROCESS(MAYBE_CursorControl) +TEST_PPAPI_OUT_OF_PROCESS(MAYBE_CursorControl) +TEST_PPAPI_NACL_VIA_HTTP(MAYBE_CursorControl) TEST_PPAPI_IN_PROCESS(InputEvent) TEST_PPAPI_OUT_OF_PROCESS(InputEvent) @@ -505,9 +512,9 @@ TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileSystem) TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileSystem) TEST_PPAPI_NACL_VIA_HTTP(FileSystem) -// http://crbug.com/96767 and 104384 for aura: -// reaches NOTIMPLEMENTED checks. -#if defined(OS_MACOSX) || defined(USE_AURA) +// http://crbug.com/96767 and 104384 for aura and 108180 for linux +// reaches NOTIMPLEMENTED checks in some cases. +#if defined(OS_MACOSX) || defined(USE_AURA) || defined(OS_LINUX) #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen #else #define MAYBE_FlashFullscreen FlashFullscreen |