Author: tberghammer Date: Tue Dec 15 06:11:00 2015 New Revision: 255641 URL: http://llvm.org/viewvc/llvm-project?rev=255641&view=rev Log: 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 meening but they converged to the point where they are used interchangably. This CL removes the ENABLE_STD_THREADS one to simplify the test suite and avoid some confusion. Differential revision: http://reviews.llvm.org/D15498 Modified: lldb/trunk/packages/Python/lldbsuite/test/api/multithreaded/Makefile lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/Makefile lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/Makefile lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/Makefile lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/Makefile lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/Makefile lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile Modified: lldb/trunk/packages/Python/lldbsuite/test/api/multithreaded/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/api/multithreaded/Makefile?rev=255641&r1=255640&r2=255641&view=diff ============================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/api/multithreaded/Makefile (original) +++ lldb/trunk/packages/Python/lldbsuite/test/api/multithreaded/Makefile Tue Dec 15 06:11:00 2015 @@ -1,6 +1,6 @@ LEVEL = ../../make -ENABLE_STD_THREADS := YES +ENABLE_THREADS := YES CXX_SOURCES := main.cpp include $(LEVEL)/Makefile.rules Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/Makefile?rev=255641&r1=255640&r2=255641&view=diff ============================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/Makefile (original) +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/Makefile Tue Dec 15 06:11:00 2015 @@ -1,6 +1,6 @@ LEVEL = ../../../make CXX_SOURCES := main.cpp -ENABLE_STD_THREADS := YES +ENABLE_THREADS := YES include $(LEVEL)/Makefile.rules Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/Makefile?rev=255641&r1=255640&r2=255641&view=diff ============================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/Makefile (original) +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/Makefile Tue Dec 15 06:11:00 2015 @@ -1,5 +1,5 @@ LEVEL = ../../make CXX_SOURCES := main.cpp -ENABLE_STD_THREADS := YES +ENABLE_THREADS := YES include $(LEVEL)/Makefile.rules Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile?rev=255641&r1=255640&r2=255641&view=diff ============================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile (original) +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile Tue Dec 15 06:11:00 2015 @@ -2,5 +2,5 @@ LEVEL = ../../../make CXXFLAGS += -std=c++11 CXX_SOURCES := ParallelTask.cpp -ENABLE_STD_THREADS := YES +ENABLE_THREADS := YES include $(LEVEL)/Makefile.rules Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile?rev=255641&r1=255640&r2=255641&view=diff ============================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile (original) +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile Tue Dec 15 06:11:00 2015 @@ -1,5 +1,5 @@ LEVEL = ../../../make CXX_SOURCES := main.cpp -ENABLE_STD_THREADS := YES +ENABLE_THREADS := YES include $(LEVEL)/Makefile.rules Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile?rev=255641&r1=255640&r2=255641&view=diff ============================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile (original) +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile Tue Dec 15 06:11:00 2015 @@ -1,5 +1,5 @@ -LEVEL = ../../../make - -CXX_SOURCES := main.cpp -ENABLE_STD_THREADS := YES -include $(LEVEL)/Makefile.rules +LEVEL = ../../../make + +CXX_SOURCES := main.cpp +ENABLE_THREADS := YES +include $(LEVEL)/Makefile.rules Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/Makefile?rev=255641&r1=255640&r2=255641&view=diff ============================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/Makefile (original) +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/Makefile Tue Dec 15 06:11:00 2015 @@ -1,6 +1,6 @@ LEVEL = ../../../make -ENABLE_STD_THREADS := YES +ENABLE_THREADS := YES CXX_SOURCES := main.cpp include $(LEVEL)/Makefile.rules Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/Makefile?rev=255641&r1=255640&r2=255641&view=diff ============================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/Makefile (original) +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/Makefile Tue Dec 15 06:11:00 2015 @@ -1,6 +1,6 @@ LEVEL = ../../../make -ENABLE_STD_THREADS := YES +ENABLE_THREADS := YES CXX_SOURCES := main.cpp include $(LEVEL)/Makefile.rules Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/Makefile?rev=255641&r1=255640&r2=255641&view=diff ============================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/Makefile (original) +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/Makefile Tue Dec 15 06:11:00 2015 @@ -1,6 +1,6 @@ LEVEL = ../../../make -ENABLE_STD_THREADS := YES +ENABLE_THREADS := YES CXX_SOURCES := main.cpp include $(LEVEL)/Makefile.rules Modified: lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules?rev=255641&r1=255640&r2=255641&view=diff ============================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules (original) +++ lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules Tue Dec 15 06:11:00 2015 @@ -208,7 +208,7 @@ LD = $(CC) 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 Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile?rev=255641&r1=255640&r2=255641&view=diff ============================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile (original) +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile Tue Dec 15 06:11:00 2015 @@ -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
