summaryrefslogtreecommitdiffstats
path: root/chrome/browser/nacl_host
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-09 05:11:21 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-09 05:11:21 +0000
commit2ef53b3938bda5d3e70a12abf08ae6259a898aa5 (patch)
treefd202de4589082ffe87d5682dd7f5ef59102ff6e /chrome/browser/nacl_host
parent3f6ee9ad799a0baa0165e680242f6d945715346c (diff)
downloadchromium_src-2ef53b3938bda5d3e70a12abf08ae6259a898aa5.zip
chromium_src-2ef53b3938bda5d3e70a12abf08ae6259a898aa5.tar.gz
chromium_src-2ef53b3938bda5d3e70a12abf08ae6259a898aa5.tar.bz2
Disable NaClGdbTest.Empty under ASAN-only. Remove useless asan gtest exclude files.
BUG=122219 TEST=none Review URL: https://chromiumcodereview.appspot.com/9949063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131331 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/nacl_host')
-rw-r--r--chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc b/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc
index 5ac275c..cc0537c0 100644
--- a/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc
+++ b/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc
@@ -32,9 +32,8 @@ class NaClGdbTest : public PPAPINaClTest {
}
};
-// Disabling for now on linux, it fails on the ASAN test bot.
-// See http://crbug.com/122219
-#if defined(OS_LINUX)
+// Fails on the ASAN test bot. See http://crbug.com/122219
+#if defined(ADDRESS_SANITIZER)
#define MAYBE_Empty DISABLED_Empty
#else
#define MAYBE_Empty Empty