Commit missing part of "Split many_tls_keys.cpp into two tests"

https://reviews.llvm.org/D67428

This change was lost due to a file rename and modification.


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@371941 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 8 insertions, 28 deletions

diff --git a/test/lsan/TestCases/many_tls_keys_pthread.cpp b/test/lsan/TestCases/many_tls_keys_pthread.cpp
index 5b5d692a5..ecc577ac4 100644
--- a/test/lsan/TestCases/many_tls_keys_pthread.cpp
+++ b/test/lsan/TestCases/many_tls_keys_pthread.cpp
@@ -1,17 +1,16 @@
 // Test that lsan handles tls correctly for many threads
 // RUN: LSAN_BASE="report_objects=1:use_stacks=0:use_registers=0"
-// RUN: %clangxx_lsan %s -DUSE_THREAD -o %t-thread
-// RUN: %clangxx_lsan %s -DUSE_PTHREAD -o %t-pthread
-// RUN: %env_lsan_opts=$LSAN_BASE:"use_tls=0" not %run %t-thread 2>&1 | FileCheck %s
-// RUN: %env_lsan_opts=$LSAN_BASE:"use_tls=1" %run %t-thread 2>&1
-// RUN: %env_lsan_opts="" %run %t-thread 2>&1
-// RUN: %env_lsan_opts=$LSAN_BASE:"use_tls=0" not %run %t-pthread 2>&1 | FileCheck %s
-// RUN: %env_lsan_opts=$LSAN_BASE:"use_tls=1" %run %t-pthread 2>&1
-// RUN: %env_lsan_opts="" %run %t-pthread 2>&1
+// RUN: %clangxx_lsan %s -o %t
+// RUN: %env_lsan_opts=$LSAN_BASE:"use_tls=0" not %run %t 2>&1 | FileCheck %s
+// RUN: %env_lsan_opts=$LSAN_BASE:"use_tls=1" %run %t 2>&1
+// RUN: %env_lsan_opts="" %run %t 2>&1
 
 // Patch r303906 did not fix all the problems.
 // UNSUPPORTED: arm-linux,armhf-linux
 
+// TSD on NetBSD does not use TLS
+// UNSUPPORTED: netbsd
+
 #include <assert.h>
 #include <limits.h>
 #include <pthread.h>
@@ -24,22 +23,6 @@ pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
 pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 int finished = 0;
 
-#if USE_THREAD
-__thread void *ptr1;
-__thread void *ptr2;
-__thread void *ptr3;
-__thread void *ptr4;
-__thread void *ptr5;
-
-void alloc() {
-  ptr1 = malloc(1111);
-  ptr2 = malloc(2222);
-  ptr3 = malloc(3333);
-  ptr4 = malloc(4444);
-  ptr5 = malloc(5555);
-}
-
-#elif USE_PTHREAD
 // We won't be able to create the maximum number of keys, due to other users
 // of the tls, but we'll use as many keys as we can before failing to create
 // a new key.
@@ -59,7 +42,6 @@ void alloc() {
 void pthread_destructor(void *arg) {
   assert(0 && "pthread destructors shouldn't be called");
 }
-#endif
 
 void *thread_start(void *arg) {
   alloc();
@@ -74,14 +56,12 @@ void *thread_start(void *arg) {
 }
 
 int main() {
-#if USE_PTHREAD
   for (int i = 0; i < PTHREAD_KEYS_MAX; ++i) {
     if (pthread_key_create(&keys[i], pthread_destructor)) {
       keys[i] = PTHREAD_KEY_INVALID;
       break;
     }
   }
-#endif
 
   pthread_t thread[NUM_THREADS];
   for (int i = 0; i < NUM_THREADS; ++i) {
diff --git a/test/lsan/TestCases/many_tls_keys_thread.cpp b/test/lsan/TestCases/many_tls_keys_thread.cpp
index 7e7196fc1..cdba0d178 100644
--- a/test/lsan/TestCases/many_tls_keys_thread.cpp
+++ b/test/lsan/TestCases/many_tls_keys_thread.cpp
@@ -1,6 +1,6 @@
 // Test that lsan handles tls correctly for many threads
 // RUN: LSAN_BASE="report_objects=1:use_stacks=0:use_registers=0"
-// RUN: %clangxx_lsan %s -DUSE_THREAD -o %t
+// RUN: %clangxx_lsan %s -o %t
 // RUN: %env_lsan_opts=$LSAN_BASE:"use_tls=0" not %run %t 2>&1 | FileCheck %s
 // RUN: %env_lsan_opts=$LSAN_BASE:"use_tls=1" %run %t 2>&1
 // RUN: %env_lsan_opts="" %run %t 2>&1