summaryrefslogtreecommitdiffstats
path: root/lldb/packages/Python/lldbsuite/test
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test')
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/TestBreakpointCommand.py8
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/command/script/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/call-function/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/call-overridden-method/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/char/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/completion/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/context-object/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/formatters/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-basic/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-basic/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-basic/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/options/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/rdar44436068/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/test/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/timeout/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/top-level/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/top-level/dummy.mk2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/frame/language/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/frame/var-scope/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/frame/var/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/log/basic/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/process/attach/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/process/launch/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/settings/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/settings/quoting/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/statistics/basic/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/target/basic/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/target/create-deps/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/target/create-deps/a.mk2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/Makefile2
-rw-r--r--lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/Makefile2
86 files changed, 89 insertions, 89 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/Makefile b/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/Makefile
index 8a7102e347a..314f1cb2f07 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/TestBreakpointCommand.py b/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/TestBreakpointCommand.py
index b75a6db6e80..8b3c177b67b 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/TestBreakpointCommand.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/TestBreakpointCommand.py
@@ -83,16 +83,16 @@ class BreakpointCommandTestCase(TestBase):
self, "./main.c", self.line,
num_expected_locations=1, loc_exact=True)
lldbutil.run_break_set_by_file_and_line(
- self, "breakpoint_command/main.c", self.line,
+ self, "basic/main.c", self.line,
num_expected_locations=1, loc_exact=True)
lldbutil.run_break_set_by_file_and_line(
- self, "./breakpoint_command/main.c", self.line,
+ self, "./basic/main.c", self.line,
num_expected_locations=1, loc_exact=True)
lldbutil.run_break_set_by_file_and_line(
- self, "breakpoint/breakpoint_command/main.c", self.line,
+ self, "breakpoint/basic/main.c", self.line,
num_expected_locations=1, loc_exact=True)
lldbutil.run_break_set_by_file_and_line(
- self, "./breakpoint/breakpoint_command/main.c", self.line,
+ self, "./breakpoint/basic/main.c", self.line,
num_expected_locations=1, loc_exact=True)
# Test relative breakpoints with incorrect paths and make sure we get
# no breakpoint locations
diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/Makefile b/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/Makefile
index 8a7102e347a..314f1cb2f07 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/Makefile b/lldb/packages/Python/lldbsuite/test/commands/command/script/Makefile
index 8a7102e347a..314f1cb2f07 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/command/script/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/Makefile
index 8a7102e347a..314f1cb2f07 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
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 8a7102e347a..314f1cb2f07 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
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 8a7102e347a..314f1cb2f07 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,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
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 9d4f3b7f141..6e8e801af01 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
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 9d4f3b7f141..6e8e801af01 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,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
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 1c93ae1de43..e56f0ab614d 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
C_SOURCES := lotta-signals.c
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 8a7102e347a..314f1cb2f07 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,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/char/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/char/Makefile
index 8a7102e347a..314f1cb2f07 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/char/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/char/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
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 8a7102e347a..314f1cb2f07 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,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/completion/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/completion/Makefile
index 6fc26a9193f..feebe26aad1 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/completion/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp other.cpp
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 8a7102e347a..314f1cb2f07 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/context-object/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
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 f5a47fcc46c..cd9ca5c86d8 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,3 @@
-LEVEL = ../../make
+LEVEL = ../../../make
C_SOURCES := main.c
include $(LEVEL)/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 50d4ab65a6e..6067ee45e98 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,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
C_SOURCES := main.c
CFLAGS_EXTRAS += -std=c99
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 0d70f259501..b09a579159d 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
C_SOURCES := main.c
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 8a7102e347a..314f1cb2f07 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,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/Makefile
index 8a7102e347a..314f1cb2f07 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
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 8a7102e347a..314f1cb2f07 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,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
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 01718d86aa7..6ed2bcfcffc 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,4 +1,4 @@
-LEVEL = ../../../make
+LEVEL = ../../../../make
USE_LIBCPP := 1
CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS)
CXX_SOURCES := main.cpp
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 01718d86aa7..6ed2bcfcffc 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,4 +1,4 @@
-LEVEL = ../../../make
+LEVEL = ../../../../make
USE_LIBCPP := 1
CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS)
CXX_SOURCES := main.cpp
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 01718d86aa7..6ed2bcfcffc 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,4 +1,4 @@
-LEVEL = ../../../make
+LEVEL = ../../../../make
USE_LIBCPP := 1
CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS)
CXX_SOURCES := main.cpp
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 01718d86aa7..6ed2bcfcffc 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,4 +1,4 @@
-LEVEL = ../../../make
+LEVEL = ../../../../make
USE_LIBCPP := 1
CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS)
CXX_SOURCES := main.cpp
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 01718d86aa7..6ed2bcfcffc 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,4 +1,4 @@
-LEVEL = ../../../make
+LEVEL = ../../../../make
USE_LIBCPP := 1
CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS)
CXX_SOURCES := main.cpp
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 01718d86aa7..6ed2bcfcffc 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,4 +1,4 @@
-LEVEL = ../../../make
+LEVEL = ../../../../make
USE_LIBCPP := 1
CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS)
CXX_SOURCES := main.cpp
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 01718d86aa7..6ed2bcfcffc 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,4 +1,4 @@
-LEVEL = ../../../make
+LEVEL = ../../../../make
USE_LIBCPP := 1
CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS)
CXX_SOURCES := main.cpp
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 01718d86aa7..6ed2bcfcffc 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,4 +1,4 @@
-LEVEL = ../../../make
+LEVEL = ../../../../make
USE_LIBCPP := 1
CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS)
CXX_SOURCES := main.cpp
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 01718d86aa7..6ed2bcfcffc 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,4 +1,4 @@
-LEVEL = ../../../make
+LEVEL = ../../../../make
USE_LIBCPP := 1
CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS)
CXX_SOURCES := main.cpp
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 01718d86aa7..6ed2bcfcffc 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,4 +1,4 @@
-LEVEL = ../../../make
+LEVEL = ../../../../make
USE_LIBCPP := 1
CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS)
CXX_SOURCES := main.cpp
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 01718d86aa7..6ed2bcfcffc 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,4 +1,4 @@
-LEVEL = ../../../make
+LEVEL = ../../../../make
USE_LIBCPP := 1
CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS)
CXX_SOURCES := main.cpp
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 01718d86aa7..6ed2bcfcffc 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,4 +1,4 @@
-LEVEL = ../../../make
+LEVEL = ../../../../make
USE_LIBCPP := 1
CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS)
CXX_SOURCES := main.cpp
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 01718d86aa7..6ed2bcfcffc 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,4 +1,4 @@
-LEVEL = ../../../make
+LEVEL = ../../../../make
USE_LIBCPP := 1
CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS)
CXX_SOURCES := main.cpp
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 e04d73ea487..855bda52986 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,4 @@
-LEVEL = ../../../make
+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.
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 01718d86aa7..6ed2bcfcffc 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,4 +1,4 @@
-LEVEL = ../../../make
+LEVEL = ../../../../make
USE_LIBCPP := 1
CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS)
CXX_SOURCES := main.cpp
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 01718d86aa7..6ed2bcfcffc 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,4 +1,4 @@
-LEVEL = ../../../make
+LEVEL = ../../../../make
USE_LIBCPP := 1
CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS)
CXX_SOURCES := main.cpp
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 01718d86aa7..6ed2bcfcffc 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,4 +1,4 @@
-LEVEL = ../../../make
+LEVEL = ../../../../make
USE_LIBCPP := 1
CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS)
CXX_SOURCES := main.cpp
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 01718d86aa7..6ed2bcfcffc 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,4 +1,4 @@
-LEVEL = ../../../make
+LEVEL = ../../../../make
USE_LIBCPP := 1
CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS)
CXX_SOURCES := main.cpp
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 01718d86aa7..6ed2bcfcffc 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,4 +1,4 @@
-LEVEL = ../../../make
+LEVEL = ../../../../make
USE_LIBCPP := 1
CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS)
CXX_SOURCES := main.cpp
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 01718d86aa7..6ed2bcfcffc 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,4 +1,4 @@
-LEVEL = ../../../make
+LEVEL = ../../../../make
USE_LIBCPP := 1
CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS)
CXX_SOURCES := main.cpp
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 01718d86aa7..6ed2bcfcffc 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,4 +1,4 @@
-LEVEL = ../../../make
+LEVEL = ../../../../make
USE_LIBCPP := 1
CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS)
CXX_SOURCES := main.cpp
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 01718d86aa7..6ed2bcfcffc 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,4 +1,4 @@
-LEVEL = ../../../make
+LEVEL = ../../../../make
USE_LIBCPP := 1
CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS)
CXX_SOURCES := main.cpp
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 8a7102e347a..314f1cb2f07 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
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 bf2c0b2c108..9884d7d20b1 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,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
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 c4169a9b101..53303eaf4f8 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
default: a.out
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 8a7102e347a..314f1cb2f07 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
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 f5a47fcc46c..cd9ca5c86d8 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,3 @@
-LEVEL = ../../make
+LEVEL = ../../../make
C_SOURCES := main.c
include $(LEVEL)/Makefile.rules
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 a10791d5890..f48ae861ae2 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
C_SOURCES := locking.c
ENABLE_THREADS := YES
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/options/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/options/Makefile
index 81ae6f6f16e..457c4972f2d 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/options/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/options/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp foo.cpp
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 db5f575866d..f3d1687cd9f 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,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
C_SOURCES := main.c
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 0d70f259501..b09a579159d 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
C_SOURCES := main.c
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 0d70f259501..b09a579159d 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
C_SOURCES := main.c
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/Makefile
index 8a7102e347a..314f1cb2f07 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
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 0d70f259501..b09a579159d 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
C_SOURCES := main.c
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 0d70f259501..b09a579159d 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
C_SOURCES := main.c
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 0d70f259501..b09a579159d 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
C_SOURCES := main.c
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/Makefile
index f5a47fcc46c..cd9ca5c86d8 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/Makefile
@@ -1,3 +1,3 @@
-LEVEL = ../../make
+LEVEL = ../../../make
C_SOURCES := main.c
include $(LEVEL)/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 f5a47fcc46c..cd9ca5c86d8 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/rdar44436068/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar44436068/Makefile
@@ -1,3 +1,3 @@
-LEVEL = ../../make
+LEVEL = ../../../make
C_SOURCES := main.c
include $(LEVEL)/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 0d70f259501..b09a579159d 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,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
C_SOURCES := main.c
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 83b24da17b4..80d2f745dad 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
CXXFLAGS += -std=c++11
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/test/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/test/Makefile
index 8a7102e347a..314f1cb2f07 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/test/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/test/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/Makefile
index c9cff412c1b..49138c83c69 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := wait-a-while.cpp
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 9e35242c72f..68fb539d6d8 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp test.cpp
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 af97678b2cf..851e96e6f3a 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,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := dummy.cpp
EXE := dummy
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 3759b5f9255..7cc295cc1f4 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,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
CXX_FLAGS_EXTRA := -finput-charset=UTF-8 -fextended-identifiers
include $(LEVEL)/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 8a7102e347a..314f1cb2f07 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
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 8a7102e347a..314f1cb2f07 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,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/Makefile
index 8a7102e347a..314f1cb2f07 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/language/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/language/Makefile
index cb1af719ac3..127cea792d2 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/frame/language/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/language/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp other.cpp other-2.cpp
C_SOURCES := somefunc.c
diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/var-scope/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/var-scope/Makefile
index f5a47fcc46c..cd9ca5c86d8 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/frame/var-scope/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/var-scope/Makefile
@@ -1,3 +1,3 @@
-LEVEL = ../../make
+LEVEL = ../../../make
C_SOURCES := main.c
include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/var/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/var/Makefile
index 50d4ab65a6e..6067ee45e98 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/frame/var/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/var/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
C_SOURCES := main.c
CFLAGS_EXTRAS += -std=c99
diff --git a/lldb/packages/Python/lldbsuite/test/commands/log/basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/log/basic/Makefile
index d4bc9c68904..314f1cb2f07 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/log/basic/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/log/basic/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/Makefile b/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/Makefile
index 13d40a13b3e..ea27ca7dec2 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
ENABLE_THREADS := YES
diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/attach/Makefile b/lldb/packages/Python/lldbsuite/test/commands/process/attach/Makefile
index a964853f534..91c895cf68d 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/process/attach/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/attach/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/Makefile b/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/Makefile
index 3c1f73515eb..d7926a98402 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../../make
+LEVEL = ../../../../make
CXX_SOURCES := main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/launch/Makefile b/lldb/packages/Python/lldbsuite/test/commands/process/launch/Makefile
index 313da706b4a..54d1c2bf7f3 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/process/launch/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/launch/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
#CXX_SOURCES := print-cwd.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/Makefile b/lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/Makefile
index 3c6deff2d97..3ff68584fd8 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../../make
+LEVEL = ../../../../make
CXX_SOURCES := main.cpp a.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/commands/settings/Makefile b/lldb/packages/Python/lldbsuite/test/commands/settings/Makefile
index d4bc9c68904..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/settings/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/settings/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../make
CXX_SOURCES := main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/commands/settings/quoting/Makefile b/lldb/packages/Python/lldbsuite/test/commands/settings/quoting/Makefile
index 0d70f259501..b09a579159d 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/settings/quoting/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/settings/quoting/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
C_SOURCES := main.c
diff --git a/lldb/packages/Python/lldbsuite/test/commands/statistics/basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/statistics/basic/Makefile
index f5a47fcc46c..cd9ca5c86d8 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/statistics/basic/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/statistics/basic/Makefile
@@ -1,3 +1,3 @@
-LEVEL = ../../make
+LEVEL = ../../../make
C_SOURCES := main.c
include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/target/basic/Makefile
index 9117ab9388b..59375dd6db8 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/target/basic/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/basic/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
# Example:
#
diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/Makefile b/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/Makefile
index 15cb0b64f21..ca017e07ae3 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/Makefile
@@ -1,4 +1,4 @@
-LEVEL := ../../make
+LEVEL := ../../../make
LIB_PREFIX := load_
diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/a.mk b/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/a.mk
index f199bfed5b0..faec3bbfc3e 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/a.mk
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/a.mk
@@ -1,4 +1,4 @@
-LEVEL := ../../make
+LEVEL := ../../../make
LIB_PREFIX := load_
diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/Makefile b/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/Makefile
index 8a7102e347a..314f1cb2f07 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/Makefile b/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/Makefile
index 50d4ab65a6e..6067ee45e98 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
C_SOURCES := main.c
CFLAGS_EXTRAS += -std=c99
OpenPOWER on IntegriCloud