diff options
| author | Pavel Labath <pavel@labath.sk> | 2019-09-04 07:46:25 +0000 |
|---|---|---|
| committer | Pavel Labath <pavel@labath.sk> | 2019-09-04 07:46:25 +0000 |
| commit | 418a272f4ab4221c37a9272d48fd31d5ac1bddc1 (patch) | |
| tree | 1bcc614932022201607d7f9e3f148f3c27cc5b14 /lldb/packages/Python/lldbsuite/test/functionalities/thread | |
| parent | 5bfe8b562ffb33fc09fa4a4c62f0146087d16ef6 (diff) | |
| download | bcm5719-llvm-418a272f4ab4221c37a9272d48fd31d5ac1bddc1.tar.gz bcm5719-llvm-418a272f4ab4221c37a9272d48fd31d5ac1bddc1.zip | |
[dotest] Avoid the need for LEVEL= makefile boilerplate
Summary:
Instead of each test case knowing its depth relative to the test root,
we can just have dotest add the folder containing Makefile.rules to the
include path.
This was motivated by r370616, though I have been wanting to do this
ever since we moved to building tests out-of-tree.
The only manually modified files in this patch are lldbinline.py and
plugins/builder_base.py. The rest of the patch has been produced by this
shell command:
find . \( -name Makefile -o -name '*.mk' \) -exec sed --in-place -e '/LEVEL *:\?=/d' -e '1,2{/^$/d}' -e 's,\$(LEVEL)/,,' {} +
Reviewers: teemperor, aprantl, espindola, jfb
Subscribers: emaste, javed.absar, arichardson, christof, arphaman, lldb-commits
Differential Revision: https://reviews.llvm.org/D67083
llvm-svn: 370845
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/functionalities/thread')
18 files changed, 18 insertions, 54 deletions
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 24e68012ebd..78f60047cd7 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXXFLAGS += -std=c++11 CXX_SOURCES := ParallelTask.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/Makefile index f0bcf9752de..1e84d63f106 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXXFLAGS += -std=c++11 CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include 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 67aa16625bf..566938ca0cc 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,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/Makefile index 469c0809aa2..c33ae5685ef 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/Makefile index 26db4816b6e..3d0b98f13f3 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/Makefile @@ -1,4 +1,2 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include 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 67aa16625bf..566938ca0cc 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,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/Makefile index 67aa16625bf..566938ca0cc 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/Makefile index 67aa16625bf..566938ca0cc 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/Makefile index d06a7d4685f..ebecfbf9241 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/Makefile index b726fc3695f..6e962b97209 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp other.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/Makefile index 67aa16625bf..566938ca0cc 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/num_threads/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/num_threads/Makefile index 67aa16625bf..566938ca0cc 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/num_threads/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/num_threads/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/state/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/state/Makefile index 26db4816b6e..3d0b98f13f3 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/state/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/state/Makefile @@ -1,4 +1,2 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/Makefile index 035413ff763..c46619c6623 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_until/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_until/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_until/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_until/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/Makefile index d06a7d4685f..ebecfbf9241 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/Makefile index 035413ff763..c46619c6623 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break_plus_condition/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break_plus_condition/Makefile index 035413ff763..c46619c6623 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break_plus_condition/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break_plus_condition/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules |

