diff options
author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-17 10:32:54 +0000 |
---|---|---|
committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-17 10:32:54 +0000 |
commit | 570ef55fa9156a6f985584eed809e4366c1a7e57 (patch) | |
tree | 955c9b64a246087a41e221debc957532a5ed9766 /chrome/test/nacl | |
parent | 26d4f5402f58d851928b455f4cbb0699d98e1c20 (diff) | |
download | chromium_src-570ef55fa9156a6f985584eed809e4366c1a7e57.zip chromium_src-570ef55fa9156a6f985584eed809e4366c1a7e57.tar.gz chromium_src-570ef55fa9156a6f985584eed809e4366c1a7e57.tar.bz2 |
Reverting 81905, 81904, 81901
Returning to an old nacl rev, and making the integration tests an empty stub.
BUG=None
TEST=None
TBR=ncbray@google.com
Review URL: http://codereview.chromium.org/6873035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81908 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/nacl')
-rw-r--r-- | chrome/test/nacl/nacl_sandbox_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/test/nacl/nacl_sandbox_test.cc b/chrome/test/nacl/nacl_sandbox_test.cc index b1c77df..d42131d 100644 --- a/chrome/test/nacl/nacl_sandbox_test.cc +++ b/chrome/test/nacl/nacl_sandbox_test.cc @@ -38,7 +38,7 @@ NaClSandboxTest::NaClSandboxTest() { NaClSandboxTest::~NaClSandboxTest() { } -TEST_F(NaClSandboxTest, DISABLED_NaClOuterSBTest) { +TEST_F(NaClSandboxTest, NaClOuterSBTest) { // Load a helloworld .nexe to trigger the nacl loader test. FilePath test_file(kANaClHtmlFile); RunTest(test_file, TestTimeouts::action_max_timeout_ms()); |