diff options
| author | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 18:37:26 +0000 |
|---|---|---|
| committer | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 18:37:26 +0000 |
| commit | 7f87aef109b2603847d02d70aefef64646029bf9 (patch) | |
| tree | b63883ab02b097daa2fe7b06c0b9479e37f60334 /chrome/test/nacl | |
| parent | 714e8bd3936c913c0c8369454646326524cb4c1f (diff) | |
| download | chromium_src-7f87aef109b2603847d02d70aefef64646029bf9.zip chromium_src-7f87aef109b2603847d02d70aefef64646029bf9.tar.gz chromium_src-7f87aef109b2603847d02d70aefef64646029bf9.tar.bz2 | |
Reenable nacl_ui_tests for Mac and Linux
Review URL: http://codereview.chromium.org/1508011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43242 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/nacl')
| -rw-r--r-- | chrome/test/nacl/nacl_test.cc | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/chrome/test/nacl/nacl_test.cc b/chrome/test/nacl/nacl_test.cc index c42dbe4..7d2b6de 100644 --- a/chrome/test/nacl/nacl_test.cc +++ b/chrome/test/nacl/nacl_test.cc @@ -265,32 +265,56 @@ TEST_F(NaClTest, ServerTest) { // Those tests are disabled because they don't work on Windows. // BUG:28176 +#if defined(OS_WIN) TEST_F(NaClTest, FLAKY_SrpcHelloWorld) { +#else +TEST_F(NaClTest, SrpcHelloWorld) { +#endif FilePath test_file(kSrpcHwHtmlFileName); RunTest(test_file, NaClTestTimeout()); } +#if defined(OS_WIN) TEST_F(NaClTest, FLAKY_SrpcBasicTest) { +#else +TEST_F(NaClTest, SrpcBasicTest) { +#endif FilePath test_file(kSrpcBasicHtmlFileName); RunTest(test_file, NaClTestTimeout()); } +#if defined(OS_WIN) TEST_F(NaClTest, FLAKY_SrpcSockAddrTest) { +#else +TEST_F(NaClTest, SrpcSockAddrTest) { +#endif FilePath test_file(kSrpcSockAddrHtmlFileName); RunTest(test_file, NaClTestTimeout()); } +#if defined(OS_WIN) TEST_F(NaClTest, FLAKY_SrpcShmTest) { +#else +TEST_F(NaClTest, SrpcShmTest) { +#endif FilePath test_file(kSrpcShmHtmlFileName); RunTest(test_file, NaClTestTimeout()); } +#if defined(OS_WIN) TEST_F(NaClTest, FLAKY_SrpcPluginTest) { +#else +TEST_F(NaClTest, SrpcPluginTest) { +#endif FilePath test_file(kSrpcPluginHtmlFileName); RunTest(test_file, NaClTestTimeout()); } +#if defined(OS_WIN) TEST_F(NaClTest, FLAKY_SrpcNrdXferTest) { +#else +TEST_F(NaClTest, SrpcNrdXferTest) { +#endif FilePath test_file(kSrpcNrdXferHtmlFileName); RunTest(test_file, NaClTestTimeout()); } |