diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 15:55:50 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 15:55:50 +0000 |
| commit | 6492714d580187b79302635291d01c2bfa58ceec (patch) | |
| tree | abb2974046691232f723447de4d76f0f3b40a5ff /chrome/test/nacl | |
| parent | a32a525720bb5e342e5f6796ca88f97ff09356ed (diff) | |
| download | chromium_src-6492714d580187b79302635291d01c2bfa58ceec.zip chromium_src-6492714d580187b79302635291d01c2bfa58ceec.tar.gz chromium_src-6492714d580187b79302635291d01c2bfa58ceec.tar.bz2 | |
Temporarily disable NaCl tests until the next WebKit roll
TBR=pkasting
BUG=73172
TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75121 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/nacl')
| -rw-r--r-- | chrome/test/nacl/nacl_sandbox_test.cc | 3 | ||||
| -rw-r--r-- | chrome/test/nacl/nacl_ui_test.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/test/nacl/nacl_sandbox_test.cc b/chrome/test/nacl/nacl_sandbox_test.cc index d42131d..7d4a5ba 100644 --- a/chrome/test/nacl/nacl_sandbox_test.cc +++ b/chrome/test/nacl/nacl_sandbox_test.cc @@ -38,7 +38,8 @@ NaClSandboxTest::NaClSandboxTest() { NaClSandboxTest::~NaClSandboxTest() { } -TEST_F(NaClSandboxTest, NaClOuterSBTest) { +// Temporarily disabled, crbug/73172 +TEST_F(NaClSandboxTest, DISABLED_NaClOuterSBTest) { // Load a helloworld .nexe to trigger the nacl loader test. FilePath test_file(kANaClHtmlFile); RunTest(test_file, TestTimeouts::action_max_timeout_ms()); diff --git a/chrome/test/nacl/nacl_ui_test.cc b/chrome/test/nacl/nacl_ui_test.cc index 0311b98..09d82fd 100644 --- a/chrome/test/nacl/nacl_ui_test.cc +++ b/chrome/test/nacl/nacl_ui_test.cc @@ -41,7 +41,8 @@ TEST_F(NaClUITest, ServerTest) { RunTest(test_file, TestTimeouts::action_max_timeout_ms()); } -TEST_F(NaClUITest, PPAPIHelloWorld) { +// Temporarily disabled, crbug/73172 +TEST_F(NaClUITest, DISABLED_PPAPIHelloWorld) { FilePath test_file(kPPAPIHwHtmlFileName); RunTest(test_file, TestTimeouts::action_max_timeout_ms()); } |