diff options
author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-18 01:50:08 +0000 |
---|---|---|
committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-18 01:50:08 +0000 |
commit | 4757d2462ecff8976734685bea34116024668b08 (patch) | |
tree | 731474227d172c1a6d6aae0f100f37c25fbcec87 /chrome/test/nacl | |
parent | a366880f8475fa9e0e70ace062af10654b297574 (diff) | |
download | chromium_src-4757d2462ecff8976734685bea34116024668b08.zip chromium_src-4757d2462ecff8976734685bea34116024668b08.tar.gz chromium_src-4757d2462ecff8976734685bea34116024668b08.tar.bz2 |
Disable the NaCl UI Tests
These tests use the NPAPI version of Native Client. We're in the process of
switching over to the PPAPI version of Native Client. We'll re-enable these
tests once we complete the PPAPI integration.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69618 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/nacl')
-rw-r--r-- | chrome/test/nacl/nacl_sandbox_test.cc | 2 | ||||
-rw-r--r-- | chrome/test/nacl/nacl_ui_test.cc | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/chrome/test/nacl/nacl_sandbox_test.cc b/chrome/test/nacl/nacl_sandbox_test.cc index c1935b1..9472ea0 100644 --- a/chrome/test/nacl/nacl_sandbox_test.cc +++ b/chrome/test/nacl/nacl_sandbox_test.cc @@ -36,7 +36,7 @@ NaClSandboxTest::NaClSandboxTest() { NaClSandboxTest::~NaClSandboxTest() { } -TEST_F(NaClSandboxTest, NaClOuterSBTest) { +TEST_F(NaClSandboxTest, DISABLED_NaClOuterSBTest) { // Load a helloworld .nexe to trigger the nacl loader test. FilePath test_file(kSrpcHwHtmlFileName); RunTest(test_file, action_max_timeout_ms()); diff --git a/chrome/test/nacl/nacl_ui_test.cc b/chrome/test/nacl/nacl_ui_test.cc index b839d36..5299261 100644 --- a/chrome/test/nacl/nacl_ui_test.cc +++ b/chrome/test/nacl/nacl_ui_test.cc @@ -40,7 +40,7 @@ TEST_F(NaClUITest, ServerTest) { RunTest(test_file, action_max_timeout_ms()); } -TEST_F(NaClUITest, SrpcHelloWorld) { +TEST_F(NaClUITest, DISABLED_SrpcHelloWorld) { FilePath test_file(kSrpcHwHtmlFileName); RunTest(test_file, action_max_timeout_ms()); } @@ -51,32 +51,32 @@ TEST_F(NaClUITest, DISABLED_SrpcBasicTest) { RunTest(test_file, action_max_timeout_ms()); } -TEST_F(NaClUITest, SrpcSockAddrTest) { +TEST_F(NaClUITest, DISABLED_SrpcSockAddrTest) { FilePath test_file(kSrpcSockAddrHtmlFileName); RunTest(test_file, action_max_timeout_ms()); } -TEST_F(NaClUITest, SrpcShmTest) { +TEST_F(NaClUITest, DISABLED_SrpcShmTest) { FilePath test_file(kSrpcShmHtmlFileName); RunTest(test_file, action_max_timeout_ms()); } -TEST_F(NaClUITest, SrpcPluginTest) { +TEST_F(NaClUITest, DISABLED_SrpcPluginTest) { FilePath test_file(kSrpcPluginHtmlFileName); RunTest(test_file, action_max_timeout_ms()); } -TEST_F(NaClUITest, SrpcNrdXferTest) { +TEST_F(NaClUITest, DISABLED_SrpcNrdXferTest) { FilePath test_file(kSrpcNrdXferHtmlFileName); RunTest(test_file, action_max_timeout_ms()); } -TEST_F(NaClUITest, NpapiHwTest) { +TEST_F(NaClUITest, DISABLED_NpapiHwTest) { FilePath test_file(kNpapiHwHtmlFileName); RunTest(test_file, action_max_timeout_ms()); } -TEST_F(NaClUITest, MultiarchTest) { +TEST_F(NaClUITest, DISABLED_MultiarchTest) { FilePath test_file(kSrpcHwHtmlFileName); RunMultiarchTest(test_file, action_max_timeout_ms()); } |