diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-08-05 01:10:08 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-08-05 01:10:08 +0000 |
| commit | f2696aa8ac7861b2adcc63ec3c0993b1f6b1bc31 (patch) | |
| tree | 8e4ebeb343a3e8c9e678bab2b6e9858493084289 /standalone/tests/combined_test.cpp | |
| parent | fe1fc06f846db99ce40cc08417235028b929ff14 (diff) | |
| parent | e58b24349fffb8db35ff6d7fea0cd290d061664f (diff) | |
| download | scudo-android11-d1-s6-release.tar.gz | |
Snap for 6736502 from e58b24349fffb8db35ff6d7fea0cd290d061664f to rvc-d1-releaseandroid-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-release
Change-Id: I14bfad5a3a470702a50dda2b4a1ef56dc4eac46c
Diffstat (limited to 'standalone/tests/combined_test.cpp')
| -rw-r--r-- | standalone/tests/combined_test.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/standalone/tests/combined_test.cpp b/standalone/tests/combined_test.cpp index a2c06182a68..9bdbea927a8 100644 --- a/standalone/tests/combined_test.cpp +++ b/standalone/tests/combined_test.cpp @@ -18,7 +18,7 @@ static std::mutex Mutex; static std::condition_variable Cv; -static bool Ready = false; +static bool Ready; static constexpr scudo::Chunk::Origin Origin = scudo::Chunk::Origin::Malloc; @@ -311,6 +311,7 @@ template <typename AllocatorT> static void stressAllocator(AllocatorT *A) { } template <class Config> static void testAllocatorThreaded() { + Ready = false; using AllocatorT = scudo::Allocator<Config>; auto Deleter = [](AllocatorT *A) { A->unmapTestOnly(); @@ -360,7 +361,7 @@ struct DeathConfig { typedef scudo::SizeClassAllocator64<DeathSizeClassMap, DeathRegionSizeLog> Primary; typedef scudo::MapAllocator<scudo::MapAllocatorNoCache> Secondary; - template <class A> using TSDRegistryT = scudo::TSDRegistrySharedT<A, 1U>; + template <class A> using TSDRegistryT = scudo::TSDRegistrySharedT<A, 1U, 1U>; }; TEST(ScudoCombinedTest, DeathCombined) { |