summaryrefslogtreecommitdiffstats
path: root/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths
diff options
context:
space:
mode:
authorPavel Labath <pavel@labath.sk>2019-09-04 07:46:25 +0000
committerPavel Labath <pavel@labath.sk>2019-09-04 07:46:25 +0000
commit418a272f4ab4221c37a9272d48fd31d5ac1bddc1 (patch)
tree1bcc614932022201607d7f9e3f148f3c27cc5b14 /lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths
parent5bfe8b562ffb33fc09fa4a4c62f0146087d16ef6 (diff)
downloadbcm5719-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/load_using_paths')
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/hidden/Makefile4
2 files changed, 2 insertions, 6 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/Makefile
index 0b7e6687030..ff8e6268d57 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/Makefile
@@ -1,9 +1,7 @@
-LEVEL := ../../make
-
CXX_SOURCES := main.cpp
USE_LIBDL := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
all: hidden_lib a.out
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/hidden/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/hidden/Makefile
index bebfa92ecfb..5e22c8a8ea7 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/hidden/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/hidden/Makefile
@@ -1,7 +1,5 @@
-LEVEL := ../../../make
-
DYLIB_NAME := loadunload
DYLIB_CXX_SOURCES := d.cpp
DYLIB_ONLY := YES
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
OpenPOWER on IntegriCloud