diff options
Diffstat (limited to 'chrome/test/nacl/nacl_test.cc')
| -rw-r--r-- | chrome/test/nacl/nacl_test.cc | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/chrome/test/nacl/nacl_test.cc b/chrome/test/nacl/nacl_test.cc index a3a6e1f..2bfef10 100644 --- a/chrome/test/nacl/nacl_test.cc +++ b/chrome/test/nacl/nacl_test.cc @@ -238,38 +238,65 @@ int NaClTest::NaClTestTimeout() { return std::max(kNaClTestTimeout, action_max_timeout_ms()); } +#if defined(OS_MACOSX) +TEST_F(NaClTest, FLAKY_ServerTest) { +#else TEST_F(NaClTest, ServerTest) { +#endif FilePath test_file(kServerHtmlFileName); RunTest(test_file, NaClTestTimeout()); } +#if defined(OS_MACOSX) +TEST_F(NaClTest, FLAKY_SrpcHelloWorld) { +#else TEST_F(NaClTest, SrpcHelloWorld) { +#endif FilePath test_file(kSrpcHwHtmlFileName); RunTest(test_file, NaClTestTimeout()); } +#if defined(OS_MACOSX) +TEST_F(NaClTest, FLAKY_SrpcBasicTest) { +#else TEST_F(NaClTest, SrpcBasicTest) { +#endif FilePath test_file(kSrpcBasicHtmlFileName); RunTest(test_file, NaClTestTimeout()); } +#if defined(OS_MACOSX) +TEST_F(NaClTest, FLAKY_SrpcSockAddrTest) { +#else TEST_F(NaClTest, SrpcSockAddrTest) { +#endif FilePath test_file(kSrpcSockAddrHtmlFileName); RunTest(test_file, NaClTestTimeout()); } +#if defined(OS_MACOSX) +TEST_F(NaClTest, FLAKY_SrpcShmTest) { +#else TEST_F(NaClTest, SrpcShmTest) { +#endif FilePath test_file(kSrpcShmHtmlFileName); RunTest(test_file, NaClTestTimeout()); } +#if defined(OS_MACOSX) +TEST_F(NaClTest, FLAKY_SrpcPluginTest) { +#else TEST_F(NaClTest, SrpcPluginTest) { +#endif FilePath test_file(kSrpcPluginHtmlFileName); RunTest(test_file, NaClTestTimeout()); } +#if defined(OS_MACOSX) +TEST_F(NaClTest, FLAKY_SrpcNrdXferTest) { +#else TEST_F(NaClTest, SrpcNrdXferTest) { +#endif FilePath test_file(kSrpcNrdXferHtmlFileName); RunTest(test_file, NaClTestTimeout()); } - |