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/commands/expression/import-std-module | |
| 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/commands/expression/import-std-module')
22 files changed, 22 insertions, 44 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-basic/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-basic/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-basic/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-basic/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile index 855bda52986..459a66c5c8b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../../make # We don't have any standard include directories, so we can't # parse the test_common.h header we usually inject as it includes # system headers. @@ -7,4 +6,4 @@ NO_TEST_COMMON_H := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXXFLAGS += -I $(SRCDIR)/root/usr/include/c++/include/ -I $(SRCDIR)/root/usr/include/ -nostdinc -nostdinc++ -nostdlib++ CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-basic/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-basic/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules |
