Commit 5459e3d9 authored by Vlad Tsyrklevich's avatar Vlad Tsyrklevich Committed by Commit Bot

GWP-ASan: Narrow Android test exceptions

Several tests failed on the android-asan bot. Disable the crash handler
tests only on the android-asan bot, not other android bots. For the
guarded page allocator tests, re-enable and use fewer threads on
Android. (This will give us some more head room on non-ASan low end
devices as well.)

Bug: 993168
Change-Id: I290ec7d9322e862f1bd69068f1898d4fe47547fb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1755403
Auto-Submit: Vlad Tsyrklevich <vtsyrklevich@chromium.org>
Commit-Queue: Vitaly Buka <vitalybuka@chromium.org>
Reviewed-by: default avatarVitaly Buka <vitalybuka@chromium.org>
Cr-Commit-Position: refs/heads/master@{#687335}
parent 60973333
...@@ -288,13 +288,12 @@ class ThreadedHighContentionDelegate ...@@ -288,13 +288,12 @@ class ThreadedHighContentionDelegate
// Test that allocator remains in consistent state under high contention and // Test that allocator remains in consistent state under high contention and
// doesn't double-allocate pages or fail to deallocate pages. // doesn't double-allocate pages or fail to deallocate pages.
TEST_P(GuardedPageAllocatorTest, ThreadedHighContention) {
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
#define MAYBE_ThreadedHighContention DISABLED_ThreadedHighContention constexpr size_t num_threads = 200;
#else #else
#define MAYBE_ThreadedHighContention ThreadedHighContention
#endif
TEST_P(GuardedPageAllocatorTest, MAYBE_ThreadedHighContention) {
constexpr size_t num_threads = 1000; constexpr size_t num_threads = 1000;
#endif
{ {
base::DelegateSimpleThreadPool threads("page_writers", num_threads); base::DelegateSimpleThreadPool threads("page_writers", num_threads);
threads.Start(); threads.Start();
......
...@@ -352,12 +352,12 @@ class CrashHandlerTest : public base::MultiProcessTest, ...@@ -352,12 +352,12 @@ class CrashHandlerTest : public base::MultiProcessTest,
bool gwp_asan_found_; bool gwp_asan_found_;
}; };
#if (defined(ADDRESS_SANITIZER) && defined(OS_WIN)) || defined(OS_ANDROID) #if defined(ADDRESS_SANITIZER) && (defined(OS_WIN) || defined(OS_ANDROID))
// ASan intercepts crashes and crashpad doesn't have a chance to see them. // ASan intercepts crashes and crashpad doesn't have a chance to see them.
#define MAYBE_DISABLED(name) DISABLED_ ##name #define MAYBE_DISABLED(name) DISABLED_ ##name
#else #else
#define MAYBE_DISABLED(name) name #define MAYBE_DISABLED(name) name
#endif // defined(ADDRESS_SANITIZER) && defined(OS_WIN) #endif
TEST_P(CrashHandlerTest, MAYBE_DISABLED(UseAfterFree)) { TEST_P(CrashHandlerTest, MAYBE_DISABLED(UseAfterFree)) {
ASSERT_TRUE(gwp_asan_found_); ASSERT_TRUE(gwp_asan_found_);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment