Re-land "[GWP-ASan] Remove thread clamping in tests."" am: 910200d4fe

Original change: https://android-review.googlesource.com/c/platform/external/gwp_asan/+/2420551

Change-Id: Iabf966906509ddee7115c5c40788e11cfd5857cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 0 insertions, 7 deletions

diff --git a/gwp_asan/tests/recoverable.cpp b/gwp_asan/tests/recoverable.cpp
index a4c5c3f..adc9731 100644
--- a/gwp_asan/tests/recoverable.cpp
+++ b/gwp_asan/tests/recoverable.cpp
@@ -182,9 +182,6 @@ void runInterThreadThrashingSingleAlloc(unsigned NumIterations,
   std::atomic<bool> StartingGun{false};
   std::vector<std::thread> Threads;
   constexpr unsigned kNumThreads = 4;
-  if (std::thread::hardware_concurrency() < kNumThreads) {
-    GTEST_SKIP() << "Not enough threads to run this test";
-  }
 
   char *Ptr = static_cast<char *>(AllocateMemory(*GPA));
 
diff --git a/gwp_asan/tests/thread_contention.cpp b/gwp_asan/tests/thread_contention.cpp
index 0992b97..26ccd8e 100644
--- a/gwp_asan/tests/thread_contention.cpp
+++ b/gwp_asan/tests/thread_contention.cpp
@@ -44,12 +44,8 @@ void asyncTask(gwp_asan::GuardedPoolAllocator *GPA,
 
 void runThreadContentionTest(unsigned NumThreads, unsigned NumIterations,
                              gwp_asan::GuardedPoolAllocator *GPA) {
-
   std::atomic<bool> StartingGun{false};
   std::vector<std::thread> Threads;
-  if (std::thread::hardware_concurrency() < NumThreads) {
-    NumThreads = std::thread::hardware_concurrency();
-  }
 
   for (unsigned i = 0; i < NumThreads; ++i) {
     Threads.emplace_back(asyncTask, GPA, &StartingGun, NumIterations);