diff options
| author | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-20 19:18:29 +0000 |
|---|---|---|
| committer | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-20 19:18:29 +0000 |
| commit | 8cec5fa2488d84dcb0c4fe89ca72c027068b8792 (patch) | |
| tree | 81c8d2bd509de2c2c5091808d04697d5c2d4b911 /chrome/test/nacl | |
| parent | 5ec779d955c6327802fbaaf655d24f41d13ade15 (diff) | |
| download | chromium_src-8cec5fa2488d84dcb0c4fe89ca72c027068b8792.zip chromium_src-8cec5fa2488d84dcb0c4fe89ca72c027068b8792.tar.gz chromium_src-8cec5fa2488d84dcb0c4fe89ca72c027068b8792.tar.bz2 | |
Reenable nacl_ui_tests on Windows + fix win64 issue.
Some functions in master_preferences_dummy.cc are now called but they are still not relevant for the 64-bit binary.
BUG=44371
Review URL: http://codereview.chromium.org/2115011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47825 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/nacl')
| -rw-r--r-- | chrome/test/nacl/nacl_test.cc | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/chrome/test/nacl/nacl_test.cc b/chrome/test/nacl/nacl_test.cc index 9a86439..9a11953 100644 --- a/chrome/test/nacl/nacl_test.cc +++ b/chrome/test/nacl/nacl_test.cc @@ -118,75 +118,42 @@ void NaClTest::TearDown() { UITest::TearDown(); } -// http://crbug.com/44371 -#if defined(OS_WIN) -TEST_F(NaClTest, DISABLED_ServerTest) { -#else TEST_F(NaClTest, ServerTest) { -#endif FilePath test_file(kServerHtmlFileName); RunTest(test_file, action_max_timeout_ms()); } -#if defined(OS_WIN) -TEST_F(NaClTest, DISABLED_SrpcHelloWorld) { -#else TEST_F(NaClTest, SrpcHelloWorld) { -#endif FilePath test_file(kSrpcHwHtmlFileName); RunTest(test_file, action_max_timeout_ms()); } -#if defined(OS_WIN) -TEST_F(NaClTest, DISABLED_SrpcBasicTest) { -#else TEST_F(NaClTest, SrpcBasicTest) { -#endif FilePath test_file(kSrpcBasicHtmlFileName); RunTest(test_file, action_max_timeout_ms()); } -#if defined(OS_WIN) -TEST_F(NaClTest, DISABLED_SrpcSockAddrTest) { -#else TEST_F(NaClTest, SrpcSockAddrTest) { -#endif FilePath test_file(kSrpcSockAddrHtmlFileName); RunTest(test_file, action_max_timeout_ms()); } -#if defined(OS_WIN) -TEST_F(NaClTest, DISABLED_SrpcShmTest) { -#else TEST_F(NaClTest, SrpcShmTest) { -#endif FilePath test_file(kSrpcShmHtmlFileName); RunTest(test_file, action_max_timeout_ms()); } -#if defined(OS_WIN) -TEST_F(NaClTest, DISABLED_SrpcPluginTest) { -#else TEST_F(NaClTest, SrpcPluginTest) { -#endif FilePath test_file(kSrpcPluginHtmlFileName); RunTest(test_file, action_max_timeout_ms()); } -#if defined(OS_WIN) -TEST_F(NaClTest, DISABLED_SrpcNrdXferTest) { -#else TEST_F(NaClTest, SrpcNrdXferTest) { -#endif FilePath test_file(kSrpcNrdXferHtmlFileName); RunTest(test_file, action_max_timeout_ms()); } -#if defined(OS_WIN) -TEST_F(NaClTest, DISABLED_NpapiHwTest) { -#else TEST_F(NaClTest, NpapiHwTest) { -#endif FilePath test_file(kNpapiHwHtmlFileName); RunTest(test_file, action_max_timeout_ms()); } |