Commit 05954039 authored by Fergus Dall's avatar Fergus Dall

Disable CrashHandlerTest and GuardedPageAllocatorTest.ThreadedHighContention on Android

TBR=vitalybuka@chromium.org, vtsyrklevich@chromium.org

Bug: 993168
Change-Id: I0a6724ba91f51de152e17fe52a68a5be6dbd3056
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1750463Reviewed-by: default avatarFergus Dall <sidereal@google.com>
Cr-Commit-Position: refs/heads/master@{#686283}
parent f96c43fa
......@@ -288,7 +288,12 @@ class ThreadedHighContentionDelegate
// Test that allocator remains in consistent state under high contention and
// doesn't double-allocate pages or fail to deallocate pages.
TEST_P(GuardedPageAllocatorTest, ThreadedHighContention) {
#if defined(OS_ANDROID)
#define MAYBE_ThreadedHighContention DISABLED_ThreadedHighContention
#else
#define MAYBE_ThreadedHighContention ThreadedHighContention
#endif
TEST_P(GuardedPageAllocatorTest, MAYBE_ThreadedHighContention) {
constexpr size_t num_threads = 1000;
{
base::DelegateSimpleThreadPool threads("page_writers", num_threads);
......
......@@ -352,7 +352,7 @@ class CrashHandlerTest : public base::MultiProcessTest,
bool gwp_asan_found_;
};
#if defined(ADDRESS_SANITIZER) && defined(OS_WIN)
#if (defined(ADDRESS_SANITIZER) && defined(OS_WIN)) || defined(OS_ANDROID)
// ASan intercepts crashes and crashpad doesn't have a chance to see them.
#define MAYBE_DISABLED(name) DISABLED_ ##name
#else
......
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