summaryrefslogtreecommitdiffstats
path: root/chrome/test/nacl
diff options
context:
space:
mode:
authoryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-17 15:33:49 +0000
committeryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-17 15:33:49 +0000
commitfc225087ecfd3cbb121cc4e9abc02df79191dd56 (patch)
tree072a9c91c021097ca2decd66b7665514034b161d /chrome/test/nacl
parentb67f19cbe25b385272b34666226657a15298ac66 (diff)
downloadchromium_src-fc225087ecfd3cbb121cc4e9abc02df79191dd56.zip
chromium_src-fc225087ecfd3cbb121cc4e9abc02df79191dd56.tar.gz
chromium_src-fc225087ecfd3cbb121cc4e9abc02df79191dd56.tar.bz2
WebKit roll 59478:59607
TBR=atwilson BUG=44371,44371 Review URL: http://codereview.chromium.org/2132004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/nacl')
-rw-r--r--chrome/test/nacl/nacl_test.cc17
1 files changed, 9 insertions, 8 deletions
diff --git a/chrome/test/nacl/nacl_test.cc b/chrome/test/nacl/nacl_test.cc
index 8f86d70..2f13cb5 100644
--- a/chrome/test/nacl/nacl_test.cc
+++ b/chrome/test/nacl/nacl_test.cc
@@ -117,42 +117,43 @@ void NaClTest::TearDown() {
UITest::TearDown();
}
-TEST_F(NaClTest, ServerTest) {
+// http://crbug.com/44371
+TEST_F(NaClTest, DISABLED_ServerTest) {
FilePath test_file(kServerHtmlFileName);
RunTest(test_file, action_max_timeout_ms());
}
-TEST_F(NaClTest, SrpcHelloWorld) {
+TEST_F(NaClTest, DISABLED_SrpcHelloWorld) {
FilePath test_file(kSrpcHwHtmlFileName);
RunTest(test_file, action_max_timeout_ms());
}
-TEST_F(NaClTest, SrpcBasicTest) {
+TEST_F(NaClTest, DISABLED_SrpcBasicTest) {
FilePath test_file(kSrpcBasicHtmlFileName);
RunTest(test_file, action_max_timeout_ms());
}
-TEST_F(NaClTest, SrpcSockAddrTest) {
+TEST_F(NaClTest, DISABLED_SrpcSockAddrTest) {
FilePath test_file(kSrpcSockAddrHtmlFileName);
RunTest(test_file, action_max_timeout_ms());
}
-TEST_F(NaClTest, SrpcShmTest) {
+TEST_F(NaClTest, DISABLED_SrpcShmTest) {
FilePath test_file(kSrpcShmHtmlFileName);
RunTest(test_file, action_max_timeout_ms());
}
-TEST_F(NaClTest, SrpcPluginTest) {
+TEST_F(NaClTest, DISABLED_SrpcPluginTest) {
FilePath test_file(kSrpcPluginHtmlFileName);
RunTest(test_file, action_max_timeout_ms());
}
-TEST_F(NaClTest, SrpcNrdXferTest) {
+TEST_F(NaClTest, DISABLED_SrpcNrdXferTest) {
FilePath test_file(kSrpcNrdXferHtmlFileName);
RunTest(test_file, action_max_timeout_ms());
}
-TEST_F(NaClTest, NpapiHwTest) {
+TEST_F(NaClTest, DISABLED_NpapiHwTest) {
FilePath test_file(kNpapiHwHtmlFileName);
RunTest(test_file, action_max_timeout_ms());
}