[Lldb-commits] [PATCH] Remove use_pthread option from getBuildFlags in the test environment

[Tamas Berghammer]

Hi emaste, clayborg, ovyalov,

Remove use_pthread option from getBuildFlags in the test environment

Removing the option to request the usage of pthread based on an argument of the getBuildFlags method in lldbtest.py because it can be specified by a variable in the makefile for the given test case. Using the variable in the makefile works in all supported platform based on some platform specific code in test/make/Makefile.rules while the getBuildFlags method haven't had any platform specific part what cause build failure on android.

http://reviews.llvm.org/D7861

Files:
  test/functionalities/thread/create_after_attach/Makefile
  test/functionalities/thread/exit_during_step/Makefile
  test/functionalities/thread/jump/Makefile
  test/functionalities/thread/thread_exit/Makefile
  test/lldbtest.py

Index: test/functionalities/thread/create_after_attach/Makefile
===================================================================
--- test/functionalities/thread/create_after_attach/Makefile
+++ test/functionalities/thread/create_after_attach/Makefile
@@ -1,4 +1,5 @@
 LEVEL = ../../../make
 
+ENABLE_THREADS := YES
 C_SOURCES := main.c
 include $(LEVEL)/Makefile.rules
Index: test/functionalities/thread/exit_during_step/Makefile
===================================================================
--- test/functionalities/thread/exit_during_step/Makefile
+++ test/functionalities/thread/exit_during_step/Makefile
@@ -1,4 +1,5 @@
 LEVEL = ../../../make
 
+ENABLE_THREADS := YES
 CXX_SOURCES := main.cpp
 include $(LEVEL)/Makefile.rules
Index: test/functionalities/thread/jump/Makefile
===================================================================
--- test/functionalities/thread/jump/Makefile
+++ test/functionalities/thread/jump/Makefile
@@ -1,4 +1,5 @@
 LEVEL = ../../../make
 
+ENABLE_THREADS := YES
 CXX_SOURCES := main.cpp other.cpp
 include $(LEVEL)/Makefile.rules
Index: test/functionalities/thread/thread_exit/Makefile
===================================================================
--- test/functionalities/thread/thread_exit/Makefile
+++ test/functionalities/thread/thread_exit/Makefile
@@ -1,4 +1,5 @@
 LEVEL = ../../../make
 
+ENABLE_THREADS := YES
 CXX_SOURCES := main.cpp
 include $(LEVEL)/Makefile.rules
Index: test/lldbtest.py
===================================================================
--- test/lldbtest.py
+++ test/lldbtest.py
@@ -1525,11 +1525,12 @@
         
         return os.environ["CC"]
 
-    def getBuildFlags(self, use_cpp11=True, use_libcxx=False, use_libstdcxx=False, use_pthreads=True):
+    def getBuildFlags(self, use_cpp11=True, use_libcxx=False, use_libstdcxx=False):
         """ Returns a dictionary (which can be provided to build* functions above) which
             contains OS-specific build flags.
         """
         cflags = ""
+        ldflags = ""
 
         # On Mac OS X, unless specifically requested to use libstdc++, use libc++
         if not use_libstdcxx and sys.platform.startswith('darwin'):
@@ -1554,9 +1555,6 @@
         elif "clang" in self.getCompiler():
             cflags += " -stdlib=libstdc++"
 
-        if use_pthreads:
-            ldflags = "-lpthread"
-
         return {'CFLAGS_EXTRAS' : cflags,
                 'LD_EXTRAS' : ldflags,
                }

EMAIL PREFERENCES
  http://reviews.llvm.org/settings/panel/emailpreferences/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D7861.20600.patch
Type: text/x-patch
Size: 2448 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20150224/aaa79318/attachment.bin>