Enable NaCl tests on Mac and Linux

BUG=44371

Review URL: http://codereview.chromium.org/2066008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47457 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 33 insertions, 0 deletions

diff --git a/chrome/test/nacl/nacl_test.cc b/chrome/test/nacl/nacl_test.cc
index 2f13cb5..9a86439 100644
--- a/chrome/test/nacl/nacl_test.cc
+++ b/chrome/test/nacl/nacl_test.cc
@@ -56,6 +56,7 @@ NaClTest::NaClTest()
 #if defined(OS_LINUX) && defined(USE_SECCOMP_SANDBOX)
   launch_arguments_.AppendSwitch(switches::kDisableSeccompSandbox);
 #endif
+  launch_arguments_.AppendSwitchWithValue(switches::kLoggingLevel, "0");
 }
 
 NaClTest::~NaClTest() {}
@@ -118,42 +119,74 @@ void NaClTest::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());
 }