From 418a272f4ab4221c37a9272d48fd31d5ac1bddc1 Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Wed, 4 Sep 2019 07:46:25 +0000 Subject: [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 --- .../Python/lldbsuite/test/functionalities/load_unload/Makefile | 4 +--- lldb/packages/Python/lldbsuite/test/functionalities/load_unload/a.mk | 4 +--- lldb/packages/Python/lldbsuite/test/functionalities/load_unload/b.mk | 4 +--- lldb/packages/Python/lldbsuite/test/functionalities/load_unload/c.mk | 4 +--- lldb/packages/Python/lldbsuite/test/functionalities/load_unload/d.mk | 4 +--- .../Python/lldbsuite/test/functionalities/load_unload/hidden/Makefile | 4 +--- 6 files changed, 6 insertions(+), 18 deletions(-) (limited to 'lldb/packages/Python/lldbsuite/test/functionalities/load_unload') diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile index 6574478c8f4..cf6b391cb18 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile @@ -1,12 +1,10 @@ -LEVEL := ../../make - LIB_PREFIX := loadunload_ LD_EXTRAS := -L. -l$(LIB_PREFIX)d CXX_SOURCES := main.cpp USE_LIBDL := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules a.out: lib_a lib_b lib_c lib_d hidden_lib_d install_name_tool diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/a.mk b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/a.mk index fddca925dea..6ee9dc41a10 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/a.mk +++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/a.mk @@ -1,5 +1,3 @@ -LEVEL := ../../make - LIB_PREFIX := loadunload_ LD_EXTRAS := -L. -l$(LIB_PREFIX)b @@ -8,7 +6,7 @@ DYLIB_NAME := $(LIB_PREFIX)a DYLIB_CXX_SOURCES := a.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules $(DYLIB_FILENAME): lib_b diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/b.mk b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/b.mk index 2fcdbea3a1c..9d36fcac8ef 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/b.mk +++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/b.mk @@ -1,9 +1,7 @@ -LEVEL := ../../make - LIB_PREFIX := loadunload_ DYLIB_NAME := $(LIB_PREFIX)b DYLIB_CXX_SOURCES := b.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/c.mk b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/c.mk index d40949b1463..0869ab61582 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/c.mk +++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/c.mk @@ -1,9 +1,7 @@ -LEVEL := ../../make - LIB_PREFIX := loadunload_ DYLIB_NAME := $(LIB_PREFIX)c DYLIB_CXX_SOURCES := c.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/d.mk b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/d.mk index a5db3c7c31f..111988a314d 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/d.mk +++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/d.mk @@ -1,5 +1,3 @@ -LEVEL := ../../make - LIB_PREFIX := loadunload_ DYLIB_EXECUTABLE_PATH := $(CURDIR) @@ -8,4 +6,4 @@ DYLIB_NAME := $(LIB_PREFIX)d DYLIB_CXX_SOURCES := d.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/hidden/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/hidden/Makefile index 271117a0ad8..17fe6582a9e 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/hidden/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/hidden/Makefile @@ -1,9 +1,7 @@ -LEVEL := ../../../make - LIB_PREFIX := loadunload_ DYLIB_NAME := $(LIB_PREFIX)d DYLIB_CXX_SOURCES := d.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules -- cgit v1.2.3