diff options
| author | ncbray@google.com <ncbray@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-06 17:48:08 +0000 |
|---|---|---|
| committer | ncbray@google.com <ncbray@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-06 17:48:08 +0000 |
| commit | 9463b9f9c52b29bd0e20d8651e6e42655c06fb83 (patch) | |
| tree | f864f6f4c13ba8247c51c8a572a009f9505fa3a7 | |
| parent | 469aa1a9552c72b98feae0e937d6f30086371694 (diff) | |
| download | chromium_src-9463b9f9c52b29bd0e20d8651e6e42655c06fb83.zip chromium_src-9463b9f9c52b29bd0e20d8651e6e42655c06fb83.tar.gz chromium_src-9463b9f9c52b29bd0e20d8651e6e42655c06fb83.tar.bz2 | |
Enable NaCl browser tests on Linux ASAN bots.
The CL http://codereview.chromium.org/10830009/ should have fixed the breakage.
BUG= http://code.google.com/p/nativeclient/issues/detail?id=2959
Review URL: https://chromiumcodereview.appspot.com/10918034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155213 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/nacl/nacl_browsertest.cc | 7 | ||||
| -rw-r--r-- | chrome/test/nacl/nacl_browsertest_uma.cc | 7 |
2 files changed, 0 insertions, 14 deletions
diff --git a/chrome/test/nacl/nacl_browsertest.cc b/chrome/test/nacl/nacl_browsertest.cc index 84f4cbe..bd0f2cf 100644 --- a/chrome/test/nacl/nacl_browsertest.cc +++ b/chrome/test/nacl/nacl_browsertest.cc @@ -6,15 +6,8 @@ namespace { -// Disable tests under Linux ASAN. -// Linux ASAN doesn't work with NaCl. See: http://crbug.com/104832. -// TODO(ncbray) enable after http://codereview.chromium.org/10830009/ lands. -#if !(defined(ADDRESS_SANITIZER) && defined(OS_LINUX)) - NACL_BROWSER_TEST_F(NaClBrowserTest, SimpleLoad, { RunLoadTest(FILE_PATH_LITERAL("nacl_load_test.html")); }) -#endif // !(defined(ADDRESS_SANITIZER) && defined(OS_LINUX)) - } // namespace anonymous diff --git a/chrome/test/nacl/nacl_browsertest_uma.cc b/chrome/test/nacl/nacl_browsertest_uma.cc index cb5682e..fc7ac73 100644 --- a/chrome/test/nacl/nacl_browsertest_uma.cc +++ b/chrome/test/nacl/nacl_browsertest_uma.cc @@ -104,11 +104,6 @@ void HistogramHelper::CheckTotalCount(const std::string& name, expected_count << ")."; } -// Disable tests under Linux ASAN. -// Linux ASAN doesn't work with NaCl. See: http://crbug.com/104832. -// TODO(ncbray) enable after http://codereview.chromium.org/10830009/ lands. -#if !(defined(ADDRESS_SANITIZER) && defined(OS_LINUX)) - NACL_BROWSER_TEST_F(NaClBrowserTest, SuccessfulLoadUMA, { // Load a NaCl module to generate UMA data. RunLoadTest(FILE_PATH_LITERAL("nacl_load_test.html")); @@ -136,6 +131,4 @@ NACL_BROWSER_TEST_F(NaClBrowserTest, SuccessfulLoadUMA, { // TODO(ncbray) convert the rest of nacl_uma.py (currently in the NaCl repo.) // Test validation failures and crashes. -#endif // !(defined(ADDRESS_SANITIZER) && defined(OS_LINUX)) - } // namespace anonymous |