diff options
| author | chrisha@google.com <chrisha@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 15:08:04 +0000 |
|---|---|---|
| committer | chrisha@google.com <chrisha@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 15:08:04 +0000 |
| commit | aee2f33ce1dc427fd3b47d8e17f3634ce21f5387 (patch) | |
| tree | db20a34a10414e96c320c3ab61c98ecce1cffab0 /chrome | |
| parent | 0dcb85a5be580fc9754d8dd0f9615b9a3e0b30f0 (diff) | |
| download | chromium_src-aee2f33ce1dc427fd3b47d8e17f3634ce21f5387.zip chromium_src-aee2f33ce1dc427fd3b47d8e17f3634ce21f5387.tar.gz chromium_src-aee2f33ce1dc427fd3b47d8e17f3634ce21f5387.tar.bz2 | |
Use SYZYASAN instead of ADDRESS_SANITIZER.
We've seen different failure related to the fact that we use the same flag without providing the same API and functionality.
BUG=
TBR=jamesr
Review URL: https://codereview.chromium.org/212643015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259855 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
7 files changed, 12 insertions, 12 deletions
diff --git a/chrome/browser/accessibility/accessibility_extension_apitest.cc b/chrome/browser/accessibility/accessibility_extension_apitest.cc index 00a1013..10b55c2 100644 --- a/chrome/browser/accessibility/accessibility_extension_apitest.cc +++ b/chrome/browser/accessibility/accessibility_extension_apitest.cc @@ -12,8 +12,8 @@ #include "chrome/test/base/test_switches.h" #include "extensions/common/switches.h" -// Times out on win asan, http://crbug.com/166026 -#if defined(OS_WIN) && defined(ADDRESS_SANITIZER) +// Times out on win syzyasan, http://crbug.com/166026 +#if defined(SYZYASAN) #define MAYBE_GetAlertsForTab DISABLED_GetAlertsForTab #else #define MAYBE_GetAlertsForTab GetAlertsForTab diff --git a/chrome/browser/extensions/active_tab_apitest.cc b/chrome/browser/extensions/active_tab_apitest.cc index 3e91b924..1ad461c 100644 --- a/chrome/browser/extensions/active_tab_apitest.cc +++ b/chrome/browser/extensions/active_tab_apitest.cc @@ -13,8 +13,8 @@ namespace extensions { namespace { -// Times out on win asan, http://crbug.com/166026 -#if defined(OS_WIN) && defined(ADDRESS_SANITIZER) +// Times out on win syzyasan, http://crbug.com/166026 +#if defined(SYZYASAN) #define MAYBE_ActiveTab DISABLED_ActiveTab #else #define MAYBE_ActiveTab ActiveTab diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc index 6a0b3e3..580c404d 100644 --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc @@ -16,8 +16,8 @@ #include "chrome/common/pref_names.h" #include "components/user_prefs/user_prefs.h" -// Times out on win asan, http://crbug.com/166026 -#if defined(OS_WIN) && defined(ADDRESS_SANITIZER) +// Times out on win syzyasan, http://crbug.com/166026 +#if defined(SYZYASAN) #define MAYBE_BookmarkManager DISABLED_BookmarkManager #else #define MAYBE_BookmarkManager BookmarkManager diff --git a/chrome/browser/extensions/api/context_menus/context_menu_apitest.cc b/chrome/browser/extensions/api/context_menus/context_menu_apitest.cc index 85d2441..b0afc15 100644 --- a/chrome/browser/extensions/api/context_menus/context_menu_apitest.cc +++ b/chrome/browser/extensions/api/context_menus/context_menu_apitest.cc @@ -11,8 +11,8 @@ namespace extensions { -// Times out on win asan, http://crbug.com/166026 -#if defined(OS_WIN) && defined(ADDRESS_SANITIZER) +// Times out on win syzyasan, http://crbug.com/166026 +#if defined(SYZYASAN) #define MAYBE_ContextMenus DISABLED_ContextMenus #else #define MAYBE_ContextMenus ContextMenus diff --git a/chrome/browser/extensions/api/cookies/cookies_apitest.cc b/chrome/browser/extensions/api/cookies/cookies_apitest.cc index 1be7ba1..1144669 100644 --- a/chrome/browser/extensions/api/cookies/cookies_apitest.cc +++ b/chrome/browser/extensions/api/cookies/cookies_apitest.cc @@ -8,8 +8,8 @@ namespace extensions { -// Times out on win asan, http://crbug.com/166026 -#if defined(OS_WIN) && defined(ADDRESS_SANITIZER) +// Times out on win syzyasan, http://crbug.com/166026 +#if defined(SYZYASAN) #define MAYBE_Cookies DISABLED_Cookies #else #define MAYBE_Cookies Cookies diff --git a/chrome/common/chrome_version_info_win.cc b/chrome/common/chrome_version_info_win.cc index e540c2d..b52e51e 100644 --- a/chrome/common/chrome_version_info_win.cc +++ b/chrome/common/chrome_version_info_win.cc @@ -27,7 +27,7 @@ std::string VersionInfo::GetVersionStringModifier() { GoogleUpdateSettings::GetChromeChannelAndModifiers(is_system_install, &channel); } -#if defined(ADDRESS_SANITIZER) +#if defined(SYZYASAN) if (base::debug::IsBinaryInstrumented()) channel += L" SyzyASan"; #endif diff --git a/chrome/test/ppapi/ppapi_interactive_browsertest.cc b/chrome/test/ppapi/ppapi_interactive_browsertest.cc index cb6a5fd..0552a8b 100644 --- a/chrome/test/ppapi/ppapi_interactive_browsertest.cc +++ b/chrome/test/ppapi/ppapi_interactive_browsertest.cc @@ -16,7 +16,7 @@ // Disable tests under ASAN. http://crbug.com/104832. // This is a bit heavy handed, but the majority of these tests fail under ASAN. // See bug for history. -#if !defined(ADDRESS_SANITIZER) +#if !defined(ADDRESS_SANITIZER) && !defined(SYZYASAN) // Disabled due to timeouts: http://crbug.com/136548 IN_PROC_BROWSER_TEST_F( |