From 0ecdae1bdca95fb69985fac0dbf9332b0df759ae Mon Sep 17 00:00:00 2001 From: Tamas Berghammer Date: Tue, 15 Dec 2015 12:11:00 +0000 Subject: 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 llvm-svn: 255641 --- lldb/packages/Python/lldbsuite/test/api/multithreaded/Makefile | 2 +- .../test/functionalities/stop-hook/multiple_threads/Makefile | 2 +- .../Python/lldbsuite/test/functionalities/thread/Makefile | 2 +- .../test/functionalities/thread/backtrace_all/Makefile | 2 +- .../test/functionalities/thread/break_after_join/Makefile | 2 +- .../test/functionalities/thread/create_after_attach/Makefile | 10 +++++----- .../functionalities/watchpoint/hello_watchlocation/Makefile | 2 +- .../test/functionalities/watchpoint/multiple_threads/Makefile | 2 +- .../functionalities/watchpoint/watchpoint_set_command/Makefile | 2 +- lldb/packages/Python/lldbsuite/test/make/Makefile.rules | 2 +- .../test/python_api/watchpoint/watchlocation/Makefile | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) (limited to 'lldb/packages/Python/lldbsuite') diff --git a/lldb/packages/Python/lldbsuite/test/api/multithreaded/Makefile b/lldb/packages/Python/lldbsuite/test/api/multithreaded/Makefile index c974133da75..37323ea7819 100644 --- a/lldb/packages/Python/lldbsuite/test/api/multithreaded/Makefile +++ b/lldb/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 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/Makefile index b5d93fb1166..035413ff763 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/Makefile +++ b/lldb/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 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/Makefile index 6f51b234440..644e2971a2c 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/Makefile +++ b/lldb/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 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile index 90ec8b9d913..24e68012ebd 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile @@ -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 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile index 85080d5b9a4..67aa16625bf 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile +++ b/lldb/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 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile index 30c1547e35b..67aa16625bf 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile @@ -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 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/Makefile index 7fef897c059..8817fff55e8 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/Makefile +++ b/lldb/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 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/Makefile index 7fef897c059..8817fff55e8 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/Makefile +++ b/lldb/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 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/Makefile index 7fef897c059..8817fff55e8 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/Makefile +++ b/lldb/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 diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules index 32776eb0de7..1db17fbf151 100644 --- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules +++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules @@ -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 diff --git a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile index 7fef897c059..8817fff55e8 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile +++ b/lldb/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 -- cgit v1.2.3