diff options
| author | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-06 01:42:28 +0000 |
|---|---|---|
| committer | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-06 01:42:28 +0000 |
| commit | ac997648942d2b76146d5c6880517d0eff878bfa (patch) | |
| tree | e4dfd29c14c148606eb74d8f1cdb849a38f77468 | |
| parent | 3c1e99c5d1fbc2760827b734af72c3f6ff9a9203 (diff) | |
| download | chromium_src-ac997648942d2b76146d5c6880517d0eff878bfa.zip chromium_src-ac997648942d2b76146d5c6880517d0eff878bfa.tar.gz chromium_src-ac997648942d2b76146d5c6880517d0eff878bfa.tar.bz2 | |
Mark nacl_ui_tests as flaky on Mac
TEST=none
BUG=none
TBR=nsylvain
Review URL: http://codereview.chromium.org/668199
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40808 0039d316-1c4b-4281-b951-d872f2087c98
| -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()); } - |