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/linux | |
| 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/linux')
5 files changed, 5 insertions, 13 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/linux/add-symbols/Makefile b/lldb/packages/Python/lldbsuite/test/linux/add-symbols/Makefile index 71a5c11a83d..fa3eadef65f 100644 --- a/lldb/packages/Python/lldbsuite/test/linux/add-symbols/Makefile +++ b/lldb/packages/Python/lldbsuite/test/linux/add-symbols/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../make CXX_SOURCES := main.cpp LD_EXTRAS += -Wl,--build-id=none @@ -10,4 +9,4 @@ stripped.out : a.out clean:: $(RM) stripped.out -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/Makefile b/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/Makefile index 8a7102e347a..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/Makefile +++ b/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile b/lldb/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile index 7cfad32f827..169460598a2 100644 --- a/lldb/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile +++ b/lldb/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile @@ -1,9 +1,7 @@ -LEVEL := ../../make - C_SOURCES := a.c b.c a.o: CFLAGS_EXTRAS += -gsplit-dwarf -include $(LEVEL)/Makefile.rules +include Makefile.rules .PHONY: clean clean:: diff --git a/lldb/packages/Python/lldbsuite/test/linux/sepdebugsymlink/Makefile b/lldb/packages/Python/lldbsuite/test/linux/sepdebugsymlink/Makefile index 3fd14a74bf3..a290c8c6f2e 100644 --- a/lldb/packages/Python/lldbsuite/test/linux/sepdebugsymlink/Makefile +++ b/lldb/packages/Python/lldbsuite/test/linux/sepdebugsymlink/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../make C_SOURCES := main.c all: dirsymlink @@ -17,4 +16,4 @@ dirsymlink: dirreal clean:: $(RM) -r dirreal dirsymlink -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/Makefile b/lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/Makefile index 67aa16625bf..566938ca0cc 100644 --- a/lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/Makefile +++ b/lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules |
