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 --- .../lldbsuite/test/functionalities/postmortem/elf-core/gcore/main.mk | 4 +--- .../test/functionalities/postmortem/elf-core/thread_crash/main.mk | 4 +--- .../lldbsuite/test/functionalities/postmortem/minidump/Makefile | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) (limited to 'lldb/packages/Python/lldbsuite/test/functionalities/postmortem') diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/main.mk b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/main.mk index ff874a21f76..566938ca0cc 100755 --- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/main.mk +++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/main.mk @@ -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/postmortem/elf-core/thread_crash/main.mk b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/main.mk index ff874a21f76..566938ca0cc 100755 --- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/main.mk +++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/main.mk @@ -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/postmortem/minidump/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/Makefile index b3034c12abd..65e9dd2fa9e 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules -- cgit v1.2.3