tberghammer created this revision. tberghammer added reviewers: labath, zturner. tberghammer added a subscriber: lldb-commits. Herald added subscribers: danalbert, tberghammer.
Merge ENABLE_THREADS and ENABLE_STD_THREADS markers Both of these markers are used in the test suit for annotating when a test needs multi threaded support. Previously they had slightly different meaning but they converged to the point where they are used interchangeably. This CL removes the ENABLE_STD_THREADS one to simplify the test suite and avoid some confusion. Note: This CL is a preparation to get test running on android compiled with clang http://reviews.llvm.org/D15498 Files: packages/Python/lldbsuite/test/api/multithreaded/Makefile packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/Makefile packages/Python/lldbsuite/test/functionalities/thread/Makefile packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/Makefile packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/Makefile packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/Makefile packages/Python/lldbsuite/test/make/Makefile.rules packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile
Index: packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile =================================================================== --- packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile +++ packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile @@ -1,6 +1,6 @@ LEVEL = ../../../make -ENABLE_STD_THREADS := YES +ENABLE_THREADS := YES CXX_SOURCES := main.cpp include $(LEVEL)/Makefile.rules Index: packages/Python/lldbsuite/test/make/Makefile.rules =================================================================== --- packages/Python/lldbsuite/test/make/Makefile.rules +++ packages/Python/lldbsuite/test/make/Makefile.rules @@ -208,7 +208,7 @@ LDFLAGS ?= $(CFLAGS) LDFLAGS += $(LD_EXTRAS) ifeq (,$(filter $(OS), Windows_NT Android)) - ifneq (,$(filter YES,$(ENABLE_THREADS) $(ENABLE_STD_THREADS))) + ifneq (,$(filter YES,$(ENABLE_THREADS))) LDFLAGS += -pthread endif endif Index: packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/Makefile =================================================================== --- packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/Makefile +++ packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/Makefile @@ -1,6 +1,6 @@ LEVEL = ../../../make -ENABLE_STD_THREADS := YES +ENABLE_THREADS := YES CXX_SOURCES := main.cpp include $(LEVEL)/Makefile.rules Index: packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/Makefile =================================================================== --- packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/Makefile +++ packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/Makefile @@ -1,6 +1,6 @@ LEVEL = ../../../make -ENABLE_STD_THREADS := YES +ENABLE_THREADS := YES CXX_SOURCES := main.cpp include $(LEVEL)/Makefile.rules Index: packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/Makefile =================================================================== --- packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/Makefile +++ packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/Makefile @@ -1,6 +1,6 @@ LEVEL = ../../../make -ENABLE_STD_THREADS := YES +ENABLE_THREADS := YES CXX_SOURCES := main.cpp include $(LEVEL)/Makefile.rules Index: packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile =================================================================== --- packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile +++ packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile @@ -1,5 +1,5 @@ LEVEL = ../../../make CXX_SOURCES := main.cpp -ENABLE_STD_THREADS := YES +ENABLE_THREADS := YES include $(LEVEL)/Makefile.rules Index: packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile =================================================================== --- packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile +++ packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile @@ -1,5 +1,5 @@ LEVEL = ../../../make CXX_SOURCES := main.cpp -ENABLE_STD_THREADS := YES +ENABLE_THREADS := YES include $(LEVEL)/Makefile.rules Index: packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile =================================================================== --- packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile +++ packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile @@ -2,5 +2,5 @@ CXXFLAGS += -std=c++11 CXX_SOURCES := ParallelTask.cpp -ENABLE_STD_THREADS := YES +ENABLE_THREADS := YES include $(LEVEL)/Makefile.rules Index: packages/Python/lldbsuite/test/functionalities/thread/Makefile =================================================================== --- packages/Python/lldbsuite/test/functionalities/thread/Makefile +++ packages/Python/lldbsuite/test/functionalities/thread/Makefile @@ -1,5 +1,5 @@ LEVEL = ../../make CXX_SOURCES := main.cpp -ENABLE_STD_THREADS := YES +ENABLE_THREADS := YES include $(LEVEL)/Makefile.rules Index: packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/Makefile =================================================================== --- packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/Makefile +++ packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/Makefile @@ -1,6 +1,6 @@ LEVEL = ../../../make CXX_SOURCES := main.cpp -ENABLE_STD_THREADS := YES +ENABLE_THREADS := YES include $(LEVEL)/Makefile.rules Index: packages/Python/lldbsuite/test/api/multithreaded/Makefile =================================================================== --- packages/Python/lldbsuite/test/api/multithreaded/Makefile +++ packages/Python/lldbsuite/test/api/multithreaded/Makefile @@ -1,6 +1,6 @@ LEVEL = ../../make -ENABLE_STD_THREADS := YES +ENABLE_THREADS := YES CXX_SOURCES := main.cpp include $(LEVEL)/Makefile.rules
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
