[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

75 files changed, 75 insertions, 218 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/Makefile
index 261658b10ae..377a1a0373a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/Makefile
@@ -1,9 +1,7 @@
-LEVEL = ../../../make
-
 OBJCXX_SOURCES := main.mm
 
 CFLAGS_EXTRAS += -w
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 
 LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/Makefile
index 9b06ad7d705..86bbe461026 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../make
-
 CXX_SOURCES := main.cpp
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 
 LDFLAGS += -framework Accelerate
\ No newline at end of file
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/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/functionalities/data-formatter/data-formatter-categories/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/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/functionalities/data-formatter/data-formatter-cpp/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/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/functionalities/data-formatter/data-formatter-disabling/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/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/functionalities/data-formatter/data-formatter-enum-format/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/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/functionalities/data-formatter/data-formatter-globals/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/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/functionalities/data-formatter/data-formatter-named-summaries/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/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/functionalities/data-formatter/data-formatter-objc/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/Makefile
index 9f7fb1ca623..03b57891386 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/Makefile
@@ -1,9 +1,7 @@
-LEVEL = ../../../make
-
 OBJC_SOURCES := main.m
 
 CFLAGS_EXTRAS += -w
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 
 LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/Makefile
index 0d94c2247f1..03b57891386 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/Makefile
@@ -1,9 +1,7 @@
-LEVEL = ../../../../make
-
 OBJC_SOURCES := main.m
 
 CFLAGS_EXTRAS += -w
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 
 LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile
index 0d94c2247f1..03b57891386 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile
@@ -1,9 +1,7 @@
-LEVEL = ../../../../make
-
 OBJC_SOURCES := main.m
 
 CFLAGS_EXTRAS += -w
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 
 LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile
index 9f7fb1ca623..03b57891386 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile
@@ -1,9 +1,7 @@
-LEVEL = ../../../make
-
 OBJC_SOURCES := main.m
 
 CFLAGS_EXTRAS += -w
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 
 LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/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/functionalities/data-formatter/data-formatter-python-synth/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/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/functionalities/data-formatter/data-formatter-script/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/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/functionalities/data-formatter/data-formatter-skip-summary/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile
index 637404f1bd0..720d1b1ca5a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile
@@ -1,8 +1,6 @@
-LEVEL = ../../../make
-
 CXX_SOURCES := main.cpp
 USE_LIBSTDCPP := 0
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 
 CXXFLAGS += -O0
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/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/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/Makefile
index fdd717119d9..22307c41c1c 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/Makefile
@@ -1,5 +1,4 @@
-LEVEL = ../../../../../make
 CXX_SOURCES := main.cpp
 CXXFLAGS += -std=c++11
 USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/Makefile
index bf75013f531..680e1abfbef 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../../../make
-
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/Makefile
index bf75013f531..680e1abfbef 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../../../make
-
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/Makefile
index fdd717119d9..22307c41c1c 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/Makefile
@@ -1,5 +1,4 @@
-LEVEL = ../../../../../make
 CXX_SOURCES := main.cpp
 CXXFLAGS += -std=c++11
 USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile
index d37bef7dc5c..29c68ae5740 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile
@@ -1,4 +1,3 @@
-LEVEL = ../../../../../make
 CXX_SOURCES := main.cpp
 CXXFLAGS += -std=c++11
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile
index 1f609a41d90..4a33784693a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 CXXFLAGS += -O0
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile
index 1f609a41d90..4a33784693a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 CXXFLAGS += -O0
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile
index a5dabdb6349..4a33784693a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../../make
-
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 CXXFLAGS += -O0
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile
index 1f609a41d90..4a33784693a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 CXXFLAGS += -O0
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile
index 1f609a41d90..4a33784693a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 CXXFLAGS += -O0
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile
index 1f609a41d90..4a33784693a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 CXXFLAGS += -O0
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/Makefile
index 19d6fc3e3c2..5ad5241858d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 CXXFLAGS += -std=c++17 -fno-exceptions
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/queue/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/queue/Makefile
index bf75013f531..680e1abfbef 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/queue/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/queue/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../../../make
-
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile
index 1f609a41d90..4a33784693a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 CXXFLAGS += -O0
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile
index 937b47ea06b..8b7b61c59c0 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 CXXFLAGS += -std=c++11 -O0
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/Makefile
index bf75013f531..680e1abfbef 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../../../make
-
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile
index 24d7c220d07..442886ce40f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../../../make
-
 CXX_SOURCES := main.cpp
 
 # Work around "exception specification in declaration does not match previous
@@ -8,5 +6,5 @@ CXX_SOURCES := main.cpp
 CFLAGS_EXTRAS += -fno-exceptions
 
 USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 CXXFLAGS += -O0
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/Makefile
index a6ea665ef63..3fc4d802718 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 CXXFLAGS += -std=c++17
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile
index 637fa7e80bf..c7df6a4cbf9 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
 CXX_SOURCES := main.cpp
 USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 CXXFLAGS += -O0
 
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile
index 1f609a41d90..4a33784693a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 CXXFLAGS += -O0
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile
index 2e8bcb9079b..7d43aa33e9a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile
@@ -1,8 +1,6 @@
-LEVEL = ../../../../../make
-
 CXX_SOURCES := main.cpp
 
 CFLAGS_EXTRAS += -O0
 USE_LIBSTDCPP := 1
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile
index 2e8bcb9079b..7d43aa33e9a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile
@@ -1,8 +1,6 @@
-LEVEL = ../../../../../make
-
 CXX_SOURCES := main.cpp
 
 CFLAGS_EXTRAS += -O0
 USE_LIBSTDCPP := 1
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile
index 17868d8a95f..bf8e6b8703f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
 CXX_SOURCES := main.cpp
 
 USE_LIBSTDCPP := 1
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile
index 63f2aaf9c75..654e4b15bd5 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile
@@ -1,8 +1,6 @@
-LEVEL = ../../../../../make
-
 CXX_SOURCES := main.cpp
 
 CXXFLAGS := -O0
 USE_LIBSTDCPP := 1
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile
index 2e8bcb9079b..7d43aa33e9a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile
@@ -1,8 +1,6 @@
-LEVEL = ../../../../../make
-
 CXX_SOURCES := main.cpp
 
 CFLAGS_EXTRAS += -O0
 USE_LIBSTDCPP := 1
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/Makefile
index 17868d8a95f..bf8e6b8703f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
 CXX_SOURCES := main.cpp
 
 USE_LIBSTDCPP := 1
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/Makefile
index 17868d8a95f..bf8e6b8703f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
 CXX_SOURCES := main.cpp
 
 USE_LIBSTDCPP := 1
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile
index 2e8bcb9079b..7d43aa33e9a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile
@@ -1,8 +1,6 @@
-LEVEL = ../../../../../make
-
 CXX_SOURCES := main.cpp
 
 CFLAGS_EXTRAS += -O0
 USE_LIBSTDCPP := 1
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile
index 63f2aaf9c75..654e4b15bd5 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile
@@ -1,8 +1,6 @@
-LEVEL = ../../../../../make
-
 CXX_SOURCES := main.cpp
 
 CXXFLAGS := -O0
 USE_LIBSTDCPP := 1
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/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/functionalities/data-formatter/data-formatter-synthtype/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/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/functionalities/data-formatter/data-formatter-synthval/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/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/functionalities/data-formatter/dump_dynamic/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/Makefile
index 872bf6d2087..4b46fe22a8b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/Makefile
@@ -1,5 +1,4 @@
-LEVEL = ../../../make
 CXX_SOURCES := main.cpp
 CXXFLAGS += -std=c++11
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/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/functionalities/data-formatter/frameformat_smallstruct/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/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/functionalities/data-formatter/hexcaps/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/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/functionalities/data-formatter/language_category_updates/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/language_category_updates/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/language_category_updates/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/language_category_updates/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/functionalities/data-formatter/nsarraysynth/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/Makefile
index 9f7fb1ca623..03b57891386 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/Makefile
@@ -1,9 +1,7 @@
-LEVEL = ../../../make
-
 OBJC_SOURCES := main.m
 
 CFLAGS_EXTRAS += -w
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 
 LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/Makefile
index 9f7fb1ca623..03b57891386 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/Makefile
@@ -1,9 +1,7 @@
-LEVEL = ../../../make
-
 OBJC_SOURCES := main.m
 
 CFLAGS_EXTRAS += -w
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 
 LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/Makefile
index 9f7fb1ca623..03b57891386 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/Makefile
@@ -1,9 +1,7 @@
-LEVEL = ../../../make
-
 OBJC_SOURCES := main.m
 
 CFLAGS_EXTRAS += -w
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 
 LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/Makefile
index 261658b10ae..377a1a0373a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/Makefile
@@ -1,9 +1,7 @@
-LEVEL = ../../../make
-
 OBJCXX_SOURCES := main.mm
 
 CFLAGS_EXTRAS += -w
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 
 LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/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/functionalities/data-formatter/poarray/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/Makefile
index 261658b10ae..377a1a0373a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/Makefile
@@ -1,9 +1,7 @@
-LEVEL = ../../../make
-
 OBJCXX_SOURCES := main.mm
 
 CFLAGS_EXTRAS += -w
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 
 LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/Makefile
index d85e665333e..348edcd88b4 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../make
-
 CXX_SOURCES := main.cpp
 
 CFLAGS_EXTRAS += -std=c++11
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/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/functionalities/data-formatter/refpointer-recursion/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/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/functionalities/data-formatter/setvaluefromcstring/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/Makefile
index 62a57f6cd9b..d23d47afaab 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/Makefile
@@ -1,4 +1,3 @@
-LEVEL = ../../../make
 OBJC_SOURCES := main.m
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/Makefile
index 872bf6d2087..4b46fe22a8b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/Makefile
@@ -1,5 +1,4 @@
-LEVEL = ../../../make
 CXX_SOURCES := main.cpp
 CXXFLAGS += -std=c++11
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/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/functionalities/data-formatter/synthcapping/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/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/functionalities/data-formatter/synthupdate/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile
index a8e1853a129..9048c720523 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile
@@ -1,10 +1,8 @@
-LEVEL = ../../../make
-
 OBJC_SOURCES := main.m
 
 CFLAGS_EXTRAS += -w
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
 
 LDFLAGS += -framework Foundation
 
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/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/functionalities/data-formatter/typedef_array/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/Makefile
index 3e2b0187b95..29c68ae5740 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/Makefile
@@ -1,4 +1,3 @@
-LEVEL = ../../../make
 CXX_SOURCES := main.cpp
 CXXFLAGS += -std=c++11
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/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/functionalities/data-formatter/var-in-aggregate-misuse/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/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/functionalities/data-formatter/varscript_formatting/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/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/functionalities/data-formatter/vector-types/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
 CXX_SOURCES := main.cpp
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules