Skip to content
Snippets Groups Projects
Commit b5e460e9 authored by gregoryd@google.com's avatar gregoryd@google.com
Browse files

Make nacl_ui_tests not flaky on Mac, enable the sandbox on Win64

Win64 are not enabled yet, but should run in the sandbox once they are.
Mac problem was hopefully fixed with bug 37707

BUG=http://code.google.com/p/nativeclient/issues/detail?id=342
TEST=nacl_ui_tests

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42702 0039d316-1c4b-4281-b951-d872f2087c98
parent 6818de0c
No related branches found
No related tags found
No related merge requests found
......@@ -440,7 +440,6 @@
'test_support_ui',
'../base/base.gyp:base',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../native_client/src/trusted/platform_qualify/platform_qualify.gyp:platform_qual_lib',
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
......
......@@ -60,11 +60,6 @@ NaClTest::NaClTest()
#if defined(OS_MACOSX)
launch_arguments_.AppendSwitch(switches::kNoSandbox);
#endif
#if defined(OS_WIN)
if (NaClOsIs64BitWindows())
launch_arguments_.AppendSwitch(switches::kNoSandbox);
#endif
}
NaClTest::~NaClTest() {}
......@@ -255,72 +250,37 @@ int NaClTest::NaClTestTimeout() {
return std::max(kNaClTestTimeout, action_max_timeout_ms());
}
#if defined(OS_MACOSX)
// http://code.google.com/p/nativeclient/issues/detail?id=342
TEST_F(NaClTest, FLAKY_ServerTest) {
#else
TEST_F(NaClTest, ServerTest) {
#endif
FilePath test_file(kServerHtmlFileName);
RunTest(test_file, NaClTestTimeout());
}
#if defined(OS_MACOSX)
// http://code.google.com/p/nativeclient/issues/detail?id=342
TEST_F(NaClTest, FLAKY_SrpcHelloWorld) {
#else
TEST_F(NaClTest, SrpcHelloWorld) {
#endif
FilePath test_file(kSrpcHwHtmlFileName);
RunTest(test_file, NaClTestTimeout());
}
#if defined(OS_MACOSX)
// http://code.google.com/p/nativeclient/issues/detail?id=342
TEST_F(NaClTest, FLAKY_SrpcBasicTest) {
#else
TEST_F(NaClTest, SrpcBasicTest) {
#endif
FilePath test_file(kSrpcBasicHtmlFileName);
RunTest(test_file, NaClTestTimeout());
}
#if defined(OS_MACOSX)
// http://code.google.com/p/nativeclient/issues/detail?id=342
TEST_F(NaClTest, FLAKY_SrpcSockAddrTest) {
#else
TEST_F(NaClTest, SrpcSockAddrTest) {
#endif
FilePath test_file(kSrpcSockAddrHtmlFileName);
RunTest(test_file, NaClTestTimeout());
}
#if defined(OS_MACOSX)
// http://code.google.com/p/nativeclient/issues/detail?id=342
TEST_F(NaClTest, FLAKY_SrpcShmTest) {
#else
TEST_F(NaClTest, SrpcShmTest) {
#endif
FilePath test_file(kSrpcShmHtmlFileName);
RunTest(test_file, NaClTestTimeout());
}
#if defined(OS_MACOSX)
// http://code.google.com/p/nativeclient/issues/detail?id=342
TEST_F(NaClTest, FLAKY_SrpcPluginTest) {
#else
TEST_F(NaClTest, SrpcPluginTest) {
#endif
FilePath test_file(kSrpcPluginHtmlFileName);
RunTest(test_file, NaClTestTimeout());
}
#if defined(OS_MACOSX)
// http://code.google.com/p/nativeclient/issues/detail?id=342
TEST_F(NaClTest, FLAKY_SrpcNrdXferTest) {
#else
TEST_F(NaClTest, SrpcNrdXferTest) {
#endif
FilePath test_file(kSrpcNrdXferHtmlFileName);
RunTest(test_file, NaClTestTimeout());
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment