Chromium Code Reviews| Index: chrome/test/ppapi/ppapi_browsertest.cc |
| diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc |
| index 7735b40974bc86e73e904c907272c4fa2d50dad6..708857ad9397d407511b5b07e7e253a697249b85 100644 |
| --- a/chrome/test/ppapi/ppapi_browsertest.cc |
| +++ b/chrome/test/ppapi/ppapi_browsertest.cc |
| @@ -1092,8 +1092,14 @@ IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, |
| LIST_TEST(Audio_AudioCallback4) \ |
| ) |
| +#if defined(OS_LINUX) |
| +// http://crbug.com/396464 |
| +#define MAYBE_Audio DISABLED_Audio |
| +#else |
| +#define MAYBE_Audio Audio |
| +#endif |
| // PPB_Audio is not supported in-process. |
| -IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, Audio) { |
| +IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_Audio) { |
| RUN_AUDIO_SUBTESTS; |
| } |
| IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, Audio) { |
| @@ -1272,8 +1278,9 @@ IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FlashMessageLoop) { |
| #define MAYBE_Compositor0 DISABLED_Compositor0 |
| #define MAYBE_Compositor1 DISABLED_Compositor1 |
| #else |
| -#define MAYBE_Compositor0 Compositor0 |
| -#define MAYBE_Compositor1 Compositor1 |
| +// flaky on Linux: http://crbug.com/396482 |
|
viettrungluu
2014/07/23 15:26:42
Impressive that we've disabled these on all platfo
|
| +#define MAYBE_Compositor0 DISABLED_Compositor0 |
| +#define MAYBE_Compositor1 DISABLED_Compositor1 |
| #endif |
| TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor0, RUN_COMPOSITOR_SUBTESTS_0) |