diff options
| author | chrisha@chromium.org <chrisha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 17:35:10 +0000 |
|---|---|---|
| committer | chrisha@chromium.org <chrisha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 17:35:10 +0000 |
| commit | 3da8c168bba1b27d4dc59bce4755007cba0c38e3 (patch) | |
| tree | 60131034f1a59b0067e0a9dc250b2369ad2f2f58 | |
| parent | 61e3a402daf16d10ad9f14e2e7599da30eddd01b (diff) | |
| download | chromium_src-3da8c168bba1b27d4dc59bce4755007cba0c38e3.zip chromium_src-3da8c168bba1b27d4dc59bce4755007cba0c38e3.tar.gz chromium_src-3da8c168bba1b27d4dc59bce4755007cba0c38e3.tar.bz2 | |
Fix an ADDRESS_SANITIZER guard so that it works with SyzyASAN.
BUG=357024
Review URL: https://codereview.chromium.org/217023002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260188 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/tools_sanity_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/base/tools_sanity_unittest.cc b/base/tools_sanity_unittest.cc index a7db5f3..b1da3e1 100644 --- a/base/tools_sanity_unittest.cc +++ b/base/tools_sanity_unittest.cc @@ -94,10 +94,10 @@ TEST(ToolsSanityTest, MemoryLeak) { leak[4] = 1; // Make sure the allocated memory is used. } -#if defined(ADDRESS_SANITIZER) && (defined(OS_IOS) || defined(OS_WIN)) +#if (defined(ADDRESS_SANITIZER) && defined(OS_IOS)) || defined(SYZYASAN) // Because iOS doesn't support death tests, each of the following tests will -// crash the whole program under Asan. On Windows Asan is based on SyzyAsan, the -// error report mecanism is different than with Asan so those test will fail. +// crash the whole program under Asan. On Windows Asan is based on SyzyAsan; the +// error report mechanism is different than with Asan so these tests will fail. #define MAYBE_AccessesToNewMemory DISABLED_AccessesToNewMemory #define MAYBE_AccessesToMallocMemory DISABLED_AccessesToMallocMemory #else |