summaryrefslogtreecommitdiffstats
path: root/lldb/packages/Python/lldbsuite/test/commands/expression
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/commands/expression')
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/call-function/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/call-overridden-method/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/char/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-incomplete-record/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-lambda/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash1/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash2/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/completion/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/context-object/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/fixits/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/formatters/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-basic/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-basic/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-basic/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/macros/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/options/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/rdar44436068/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/test/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/timeout/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/top-level/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/top-level/dummy.mk4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/Makefile4
79 files changed, 79 insertions, 203 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/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/commands/expression/argument_passing_restrictions/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/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/commands/expression/call-function/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/Makefile
index 6e8e801af01..31f2d5e8fc2 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/Makefile
@@ -1,8 +1,6 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
clean::
rm -rf $(wildcard *.o *.d *.dSYM)
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-overridden-method/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/call-overridden-method/Makefile
index 6e8e801af01..31f2d5e8fc2 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/call-overridden-method/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-overridden-method/Makefile
@@ -1,8 +1,6 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
clean::
rm -rf $(wildcard *.o *.d *.dSYM)
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/Makefile
index e56f0ab614d..fa5901ebca1 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
C_SOURCES := lotta-signals.c
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile
index c47338f0f13..33746217ecb 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../make
-
OBJC_SOURCES := call-throws.m
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/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/commands/expression/char/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/char/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/char/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/char/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/commands/expression/class_template_specialization_empty_pack/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/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/commands/expression/completion-crash-incomplete-record/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-incomplete-record/Makefile
index 99bfa7e03b4..3d0b98f13f3 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-incomplete-record/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-incomplete-record/Makefile
@@ -1,3 +1,2 @@
-LEVEL = ../../../make
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-lambda/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-lambda/Makefile
index 99bfa7e03b4..3d0b98f13f3 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-lambda/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-lambda/Makefile
@@ -1,3 +1,2 @@
-LEVEL = ../../../make
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash1/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash1/Makefile
index 99bfa7e03b4..3d0b98f13f3 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash1/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash1/Makefile
@@ -1,3 +1,2 @@
-LEVEL = ../../../make
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash2/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash2/Makefile
index 99bfa7e03b4..3d0b98f13f3 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash2/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash2/Makefile
@@ -1,3 +1,2 @@
-LEVEL = ../../../make
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/completion/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/completion/Makefile
index feebe26aad1..020dce7c31d 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/completion/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp other.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/Makefile
index 242d36fe860..2f36b673031 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../make
-
OBJC_SOURCES := main.m
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/context-object/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/context-object/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object/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/commands/expression/dollar-in-variable/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/Makefile
index cd9ca5c86d8..c9319d6e688 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/Makefile
@@ -1,3 +1,2 @@
-LEVEL = ../../../make
C_SOURCES := main.c
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/Makefile
index 6067ee45e98..aa5f222c08e 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../make
-
C_SOURCES := main.c
CFLAGS_EXTRAS += -std=c99
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/Makefile
index b09a579159d..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
C_SOURCES := main.c
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/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/commands/expression/fixits/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/fixits/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/fixits/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/fixits/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/commands/expression/formatters/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/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/commands/expression/function_template_specialization_temp_args/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/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/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
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile
index 82e0d19a035..780b2660cd0 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../make
-
OBJC_SOURCES := main.m
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
LDFLAGS += -framework Cocoa
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/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/commands/expression/ir-interpreter-phi-nodes/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/Makefile
index 9884d7d20b1..a1f689e07c7 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/Makefile
@@ -1,5 +1,4 @@
-LEVEL = ../../../make
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/Makefile
index 53303eaf4f8..00a9da08656 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../make
-
default: a.out
C_SOURCES := main.c
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/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/commands/expression/macros/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/macros/Makefile
index 518045730b4..59070728a5f 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/macros/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/macros/Makefile
@@ -1,8 +1,6 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
DEBUG_INFO_FLAG = -g3
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/Makefile
index cd9ca5c86d8..c9319d6e688 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/Makefile
@@ -1,3 +1,2 @@
-LEVEL = ../../../make
C_SOURCES := main.c
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/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/commands/expression/namespace_local_var_same_name_obj_c/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/Makefile
index e486bedb9b0..9267f734396 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/Makefile
@@ -1,5 +1,4 @@
-LEVEL = ../../../make
OBJCXX_SOURCES := main.mm util.mm
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/Makefile
index f48ae861ae2..f63adb4f5d2 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../make
-
C_SOURCES := locking.c
ENABLE_THREADS := YES
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/options/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/options/Makefile
index 457c4972f2d..7df22699c57 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/options/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/options/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp foo.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/Makefile
index 864f1c8223c..add737b4752 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../make
-
OBJC_SOURCES := main.m
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
LDFLAGS += -framework Foundation -framework CloudKit
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/Makefile
index f3d1687cd9f..549336d0223 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../make
-
C_SOURCES := main.c
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/Makefile
index b09a579159d..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
C_SOURCES := main.c
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile
index b09a579159d..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
C_SOURCES := main.c
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile
index 242d36fe860..2f36b673031 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../make
-
OBJC_SOURCES := main.m
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/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/commands/expression/radar_8638051/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Makefile
index b09a579159d..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
C_SOURCES := main.c
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/Makefile
index b09a579159d..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
C_SOURCES := main.c
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/Makefile
index b09a579159d..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
C_SOURCES := main.c
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/Makefile
index cd9ca5c86d8..c9319d6e688 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/Makefile
@@ -1,3 +1,2 @@
-LEVEL = ../../../make
C_SOURCES := main.c
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/rdar44436068/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar44436068/Makefile
index cd9ca5c86d8..c9319d6e688 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/rdar44436068/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar44436068/Makefile
@@ -1,3 +1,2 @@
-LEVEL = ../../../make
C_SOURCES := main.c
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/Makefile
index b09a579159d..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
C_SOURCES := main.c
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile
index 80d2f745dad..4b46fe22a8b 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile
@@ -1,6 +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/commands/expression/test/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/test/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/test/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/test/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/commands/expression/timeout/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/Makefile
index 49138c83c69..06a21f5b8b4 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := wait-a-while.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/Makefile
index 68fb539d6d8..1247a8e09b2 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/Makefile
@@ -1,8 +1,6 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp test.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
a.out: dummy
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/dummy.mk b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/dummy.mk
index 851e96e6f3a..59a1cff3803 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/dummy.mk
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/dummy.mk
@@ -1,6 +1,4 @@
-LEVEL = ../../../make
-
CXX_SOURCES := dummy.cpp
EXE := dummy
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile
index 22a6e017765..b8b1d12fe2b 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../make
-
OBJC_SOURCES := main.m foo.m
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/Makefile
index 7cc295cc1f4..7fdd5c2c6ab 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/Makefile
@@ -1,4 +1,3 @@
-LEVEL = ../../../make
CXX_SOURCES := main.cpp
CXX_FLAGS_EXTRA := -finput-charset=UTF-8 -fextended-identifiers
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/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/commands/expression/vector_of_enums/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/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/commands/expression/weak_symbols/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/Makefile
index 32f0e9a13ef..9786ff38a84 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/Makefile
@@ -1,7 +1,6 @@
-LEVEL = ../../../make
CFLAGS_EXTRAS += -std=c99
LD_FLAGS := -dynamiclib
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
all: a.out dylib missing
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
OpenPOWER on IntegriCloud