summaryrefslogtreecommitdiffstats
path: root/lldb/packages/Python/lldbsuite/test/functionalities
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/functionalities')
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/archives/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/asan/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/completion/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/basic/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity-chain/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/category/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/message/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/subsystem/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity-chain/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/category/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/message/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/subsystem/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/format/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/debug/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/info/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/queue/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/language_category_updates/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/deleted-executable/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/exec/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/exec/secondprog.mk4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/Makefile1
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/simple.mk4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/load_unload/a.mk4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/load_unload/b.mk4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/load_unload/c.mk4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/load_unload/d.mk4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/load_unload/hidden/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/hidden/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/longjmp/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/memory-region/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/memory/cache/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/memory/find/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/memory/read/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/Makefile3
-rwxr-xr-xlldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/main.mk4
-rwxr-xr-xlldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/main.mk4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/process_group/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/process_save_core/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/ptr_refs/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/recursion/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/rerun/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/return-value/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/set-data/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/signal/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-abrt/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/signal/raise/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/stats_api/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/step_scripted/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq1/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq2/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_call_site/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_tail_call_seq/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/inlining_and_tail_calls/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/sbapi_support/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_message/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_or_return/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/unambiguous_sequence/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/target-new-solib-notifications/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/target_var/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/num_threads/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/state/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/step_until/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break_plus_condition/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/tsan/basic/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/tsan/cpp_global_location/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/tsan/global_location/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/tsan/multiple/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_leak/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_numbers/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/tty/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/type_completion/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/ubsan/basic/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/ubsan/user-expression/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/unwind/ehframe/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/value_md5_crash/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/var_path/Makefile4
189 files changed, 188 insertions, 546 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/archives/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/archives/Makefile
index 64da83becbd..4d1950cf34a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/archives/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/archives/Makefile
@@ -1,9 +1,7 @@
-LEVEL = ../../make
-
C_SOURCES := main.c
MAKE_DSYM := NO
ARCHIVE_NAME := libfoo.a
ARCHIVE_C_SOURCES := a.c b.c
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/asan/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/asan/Makefile
index dc8d682f831..4913a18d8cc 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/asan/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/asan/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../make
-
C_SOURCES := main.c
CFLAGS_EXTRAS := -fsanitize=address -g -gcolumn-info
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/Makefile
index 0d70f259501..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/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/functionalities/completion/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/completion/Makefile
index 8a7102e347a..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/completion/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/completion/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/Makefile
index 0d70f259501..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/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/functionalities/darwin_log/basic/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/basic/Makefile
index b09a579159d..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/basic/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/basic/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/functionalities/darwin_log/filter/exact_match/activity-chain/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity-chain/Makefile
index 4f4176f23f3..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity-chain/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity-chain/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/functionalities/darwin_log/filter/exact_match/activity/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity/Makefile
index 4f4176f23f3..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity/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/functionalities/darwin_log/filter/exact_match/category/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/category/Makefile
index 4f4176f23f3..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/category/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/category/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/functionalities/darwin_log/filter/exact_match/message/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/message/Makefile
index 4f4176f23f3..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/message/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/message/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/functionalities/darwin_log/filter/exact_match/subsystem/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/subsystem/Makefile
index 4f4176f23f3..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/subsystem/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/subsystem/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/functionalities/darwin_log/filter/regex/activity-chain/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity-chain/Makefile
index 4f4176f23f3..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity-chain/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity-chain/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/functionalities/darwin_log/filter/regex/activity/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity/Makefile
index 4f4176f23f3..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity/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/functionalities/darwin_log/filter/regex/category/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/category/Makefile
index 4f4176f23f3..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/category/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/category/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/functionalities/darwin_log/filter/regex/message/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/message/Makefile
index 4f4176f23f3..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/message/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/message/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/functionalities/darwin_log/filter/regex/subsystem/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/subsystem/Makefile
index 4f4176f23f3..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/subsystem/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/subsystem/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/functionalities/darwin_log/format/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/format/Makefile
index b09a579159d..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/format/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/format/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/functionalities/darwin_log/source/debug/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/debug/Makefile
index 214cedd96f1..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/debug/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/debug/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/functionalities/darwin_log/source/info/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/info/Makefile
index 214cedd96f1..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/info/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/info/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/functionalities/data-formatter/boolreference/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/Makefile
index 261658b10ae..377a1a0373a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/Makefile
@@ -1,9 +1,7 @@
-LEVEL = ../../../make
-
OBJCXX_SOURCES := main.mm
CFLAGS_EXTRAS += -w
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/Makefile
index 9b06ad7d705..86bbe461026 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
LDFLAGS += -framework Accelerate \ No newline at end of file
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/Makefile
index 9f7fb1ca623..03b57891386 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/Makefile
@@ -1,9 +1,7 @@
-LEVEL = ../../../make
-
OBJC_SOURCES := main.m
CFLAGS_EXTRAS += -w
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/Makefile
index 0d94c2247f1..03b57891386 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/Makefile
@@ -1,9 +1,7 @@
-LEVEL = ../../../../make
-
OBJC_SOURCES := main.m
CFLAGS_EXTRAS += -w
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile
index 0d94c2247f1..03b57891386 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile
@@ -1,9 +1,7 @@
-LEVEL = ../../../../make
-
OBJC_SOURCES := main.m
CFLAGS_EXTRAS += -w
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile
index 9f7fb1ca623..03b57891386 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile
@@ -1,9 +1,7 @@
-LEVEL = ../../../make
-
OBJC_SOURCES := main.m
CFLAGS_EXTRAS += -w
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile
index 637404f1bd0..720d1b1ca5a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile
@@ -1,8 +1,6 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
USE_LIBSTDCPP := 0
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
CXXFLAGS += -O0
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/Makefile
index fdd717119d9..22307c41c1c 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/Makefile
@@ -1,5 +1,4 @@
-LEVEL = ../../../../../make
CXX_SOURCES := main.cpp
CXXFLAGS += -std=c++11
USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/Makefile
index bf75013f531..680e1abfbef 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../../../make
-
CXX_SOURCES := main.cpp
USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/Makefile
index bf75013f531..680e1abfbef 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../../../make
-
CXX_SOURCES := main.cpp
USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/Makefile
index fdd717119d9..22307c41c1c 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/Makefile
@@ -1,5 +1,4 @@
-LEVEL = ../../../../../make
CXX_SOURCES := main.cpp
CXXFLAGS += -std=c++11
USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile
index d37bef7dc5c..29c68ae5740 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile
@@ -1,4 +1,3 @@
-LEVEL = ../../../../../make
CXX_SOURCES := main.cpp
CXXFLAGS += -std=c++11
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile
index 1f609a41d90..4a33784693a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
CXX_SOURCES := main.cpp
USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
CXXFLAGS += -O0
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile
index 1f609a41d90..4a33784693a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
CXX_SOURCES := main.cpp
USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
CXXFLAGS += -O0
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile
index a5dabdb6349..4a33784693a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../../make
-
CXX_SOURCES := main.cpp
USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
CXXFLAGS += -O0
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile
index 1f609a41d90..4a33784693a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
CXX_SOURCES := main.cpp
USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
CXXFLAGS += -O0
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile
index 1f609a41d90..4a33784693a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
CXX_SOURCES := main.cpp
USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
CXXFLAGS += -O0
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile
index 1f609a41d90..4a33784693a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
CXX_SOURCES := main.cpp
USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
CXXFLAGS += -O0
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/Makefile
index 19d6fc3e3c2..5ad5241858d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
CXX_SOURCES := main.cpp
USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
CXXFLAGS += -std=c++17 -fno-exceptions
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/queue/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/queue/Makefile
index bf75013f531..680e1abfbef 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/queue/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/queue/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../../../make
-
CXX_SOURCES := main.cpp
USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile
index 1f609a41d90..4a33784693a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
CXX_SOURCES := main.cpp
USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
CXXFLAGS += -O0
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile
index 937b47ea06b..8b7b61c59c0 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
CXX_SOURCES := main.cpp
USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
CXXFLAGS += -std=c++11 -O0
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/Makefile
index bf75013f531..680e1abfbef 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../../../make
-
CXX_SOURCES := main.cpp
USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile
index 24d7c220d07..442886ce40f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../../../make
-
CXX_SOURCES := main.cpp
# Work around "exception specification in declaration does not match previous
@@ -8,5 +6,5 @@ CXX_SOURCES := main.cpp
CFLAGS_EXTRAS += -fno-exceptions
USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
CXXFLAGS += -O0
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/Makefile
index a6ea665ef63..3fc4d802718 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
CXX_SOURCES := main.cpp
USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
CXXFLAGS += -std=c++17
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile
index 637fa7e80bf..c7df6a4cbf9 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
CXX_SOURCES := main.cpp
USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
CXXFLAGS += -O0
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile
index 1f609a41d90..4a33784693a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
CXX_SOURCES := main.cpp
USE_LIBCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
CXXFLAGS += -O0
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile
index 2e8bcb9079b..7d43aa33e9a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile
@@ -1,8 +1,6 @@
-LEVEL = ../../../../../make
-
CXX_SOURCES := main.cpp
CFLAGS_EXTRAS += -O0
USE_LIBSTDCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile
index 2e8bcb9079b..7d43aa33e9a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile
@@ -1,8 +1,6 @@
-LEVEL = ../../../../../make
-
CXX_SOURCES := main.cpp
CFLAGS_EXTRAS += -O0
USE_LIBSTDCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile
index 17868d8a95f..bf8e6b8703f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
CXX_SOURCES := main.cpp
USE_LIBSTDCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile
index 63f2aaf9c75..654e4b15bd5 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile
@@ -1,8 +1,6 @@
-LEVEL = ../../../../../make
-
CXX_SOURCES := main.cpp
CXXFLAGS := -O0
USE_LIBSTDCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile
index 2e8bcb9079b..7d43aa33e9a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile
@@ -1,8 +1,6 @@
-LEVEL = ../../../../../make
-
CXX_SOURCES := main.cpp
CFLAGS_EXTRAS += -O0
USE_LIBSTDCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/Makefile
index 17868d8a95f..bf8e6b8703f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
CXX_SOURCES := main.cpp
USE_LIBSTDCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/Makefile
index 17868d8a95f..bf8e6b8703f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../../../make
-
CXX_SOURCES := main.cpp
USE_LIBSTDCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile
index 2e8bcb9079b..7d43aa33e9a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile
@@ -1,8 +1,6 @@
-LEVEL = ../../../../../make
-
CXX_SOURCES := main.cpp
CFLAGS_EXTRAS += -O0
USE_LIBSTDCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile
index 63f2aaf9c75..654e4b15bd5 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile
@@ -1,8 +1,6 @@
-LEVEL = ../../../../../make
-
CXX_SOURCES := main.cpp
CXXFLAGS := -O0
USE_LIBSTDCPP := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/Makefile
index 872bf6d2087..4b46fe22a8b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/Makefile
@@ -1,5 +1,4 @@
-LEVEL = ../../../make
CXX_SOURCES := main.cpp
CXXFLAGS += -std=c++11
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/language_category_updates/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/language_category_updates/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/language_category_updates/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/language_category_updates/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/Makefile
index 9f7fb1ca623..03b57891386 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/Makefile
@@ -1,9 +1,7 @@
-LEVEL = ../../../make
-
OBJC_SOURCES := main.m
CFLAGS_EXTRAS += -w
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/Makefile
index 9f7fb1ca623..03b57891386 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/Makefile
@@ -1,9 +1,7 @@
-LEVEL = ../../../make
-
OBJC_SOURCES := main.m
CFLAGS_EXTRAS += -w
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/Makefile
index 9f7fb1ca623..03b57891386 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/Makefile
@@ -1,9 +1,7 @@
-LEVEL = ../../../make
-
OBJC_SOURCES := main.m
CFLAGS_EXTRAS += -w
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/Makefile
index 261658b10ae..377a1a0373a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/Makefile
@@ -1,9 +1,7 @@
-LEVEL = ../../../make
-
OBJCXX_SOURCES := main.mm
CFLAGS_EXTRAS += -w
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/Makefile
index 261658b10ae..377a1a0373a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/Makefile
@@ -1,9 +1,7 @@
-LEVEL = ../../../make
-
OBJCXX_SOURCES := main.mm
CFLAGS_EXTRAS += -w
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/Makefile
index d85e665333e..348edcd88b4 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
CFLAGS_EXTRAS += -std=c++11
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/Makefile
index 62a57f6cd9b..d23d47afaab 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/Makefile
@@ -1,4 +1,3 @@
-LEVEL = ../../../make
OBJC_SOURCES := main.m
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/Makefile
index 872bf6d2087..4b46fe22a8b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/Makefile
@@ -1,5 +1,4 @@
-LEVEL = ../../../make
CXX_SOURCES := main.cpp
CXXFLAGS += -std=c++11
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile
index a8e1853a129..9048c720523 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile
@@ -1,10 +1,8 @@
-LEVEL = ../../../make
-
OBJC_SOURCES := main.m
CFLAGS_EXTRAS += -w
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/Makefile
index 3e2b0187b95..29c68ae5740 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/Makefile
@@ -1,4 +1,3 @@
-LEVEL = ../../../make
CXX_SOURCES := main.cpp
CXXFLAGS += -std=c++11
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile
index c60ecd41463..c39b681d187 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../make
-
C_SOURCES := main.c
ifeq "$(OS)" ""
@@ -15,4 +13,4 @@ endif
MAKE_DSYM := NO
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/deleted-executable/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/deleted-executable/Makefile
index 8a7102e347a..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/deleted-executable/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/deleted-executable/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/Makefile
index ceb406ee2ea..2bba8e757f7 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../make
-
CXX_SOURCES := pass-to-base.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/exec/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/exec/Makefile
index 784a53da477..b3af2bb69fe 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/exec/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/exec/Makefile
@@ -1,10 +1,8 @@
-LEVEL = ../../make
-
CXX_SOURCES := main.cpp
all: a.out secondprog
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
secondprog:
$(MAKE) VPATH=$(VPATH) -f $(SRCDIR)/secondprog.mk
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/exec/secondprog.mk b/lldb/packages/Python/lldbsuite/test/functionalities/exec/secondprog.mk
index 88f76b5113b..63efccc68ed 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/exec/secondprog.mk
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/exec/secondprog.mk
@@ -1,6 +1,4 @@
-LEVEL = ../../make
-
CXX_SOURCES := secondprog.cpp
EXE = secondprog
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/Makefile
index c7c5ef40545..7fed83dc9eb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/Makefile
@@ -1,5 +1,4 @@
SRCDIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/
-
all: a.c clean
$(CC) -arch i386 -g -c $(SRCDIR)/a.c
ar -q liba-i386.a a.o
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/Makefile
index 0d70f259501..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/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/functionalities/inferior-changed/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/Makefile
index 0d70f259501..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/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/functionalities/inferior-crashing/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/Makefile
index 0d70f259501..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/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/functionalities/inferior-crashing/recursive-inferior/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/Makefile
index 0f8e92e9193..62c0a39c94a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../make
-
C_SOURCES := main.c
CFLAGS_EXTRAS += -fomit-frame-pointer
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/Makefile
index 532f49555e5..d94874a7a05 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/Makefile
@@ -1,9 +1,7 @@
-LEVEL = ../../make
-
CXX_SOURCES := calling.cpp
ifneq (,$(findstring icc,$(CC)))
CXXFLAGS += -debug inline-debug-info
endif
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/Makefile
index f94c29bd44d..a783487bd1c 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/Makefile
@@ -1,10 +1,8 @@
-LEVEL = ../../make
-
C_SOURCES := main.c
all: a.out simple
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
simple:
$(MAKE) VPATH=$(VPATH) -f $(SRCDIR)/simple.mk
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/simple.mk b/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/simple.mk
index 9f0c165515a..e2043c3b9c6 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/simple.mk
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/simple.mk
@@ -1,6 +1,4 @@
-LEVEL = ../../make
-
C_SOURCES := simple.c
EXE = simple
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile
index 6574478c8f4..cf6b391cb18 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile
@@ -1,12 +1,10 @@
-LEVEL := ../../make
-
LIB_PREFIX := loadunload_
LD_EXTRAS := -L. -l$(LIB_PREFIX)d
CXX_SOURCES := main.cpp
USE_LIBDL := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
a.out: lib_a lib_b lib_c lib_d hidden_lib_d install_name_tool
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/a.mk b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/a.mk
index fddca925dea..6ee9dc41a10 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/a.mk
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/a.mk
@@ -1,5 +1,3 @@
-LEVEL := ../../make
-
LIB_PREFIX := loadunload_
LD_EXTRAS := -L. -l$(LIB_PREFIX)b
@@ -8,7 +6,7 @@ DYLIB_NAME := $(LIB_PREFIX)a
DYLIB_CXX_SOURCES := a.cpp
DYLIB_ONLY := YES
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
$(DYLIB_FILENAME): lib_b
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/b.mk b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/b.mk
index 2fcdbea3a1c..9d36fcac8ef 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/b.mk
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/b.mk
@@ -1,9 +1,7 @@
-LEVEL := ../../make
-
LIB_PREFIX := loadunload_
DYLIB_NAME := $(LIB_PREFIX)b
DYLIB_CXX_SOURCES := b.cpp
DYLIB_ONLY := YES
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/c.mk b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/c.mk
index d40949b1463..0869ab61582 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/c.mk
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/c.mk
@@ -1,9 +1,7 @@
-LEVEL := ../../make
-
LIB_PREFIX := loadunload_
DYLIB_NAME := $(LIB_PREFIX)c
DYLIB_CXX_SOURCES := c.cpp
DYLIB_ONLY := YES
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/d.mk b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/d.mk
index a5db3c7c31f..111988a314d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/d.mk
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/d.mk
@@ -1,5 +1,3 @@
-LEVEL := ../../make
-
LIB_PREFIX := loadunload_
DYLIB_EXECUTABLE_PATH := $(CURDIR)
@@ -8,4 +6,4 @@ DYLIB_NAME := $(LIB_PREFIX)d
DYLIB_CXX_SOURCES := d.cpp
DYLIB_ONLY := YES
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/hidden/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/hidden/Makefile
index 271117a0ad8..17fe6582a9e 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/hidden/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/hidden/Makefile
@@ -1,9 +1,7 @@
-LEVEL := ../../../make
-
LIB_PREFIX := loadunload_
DYLIB_NAME := $(LIB_PREFIX)d
DYLIB_CXX_SOURCES := d.cpp
DYLIB_ONLY := YES
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/Makefile
index 0b7e6687030..ff8e6268d57 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/Makefile
@@ -1,9 +1,7 @@
-LEVEL := ../../make
-
CXX_SOURCES := main.cpp
USE_LIBDL := 1
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
all: hidden_lib a.out
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/hidden/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/hidden/Makefile
index bebfa92ecfb..5e22c8a8ea7 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/hidden/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/hidden/Makefile
@@ -1,7 +1,5 @@
-LEVEL := ../../../make
-
DYLIB_NAME := loadunload
DYLIB_CXX_SOURCES := d.cpp
DYLIB_ONLY := YES
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/longjmp/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/longjmp/Makefile
index 0d70f259501..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/longjmp/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/longjmp/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/functionalities/memory-region/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/memory-region/Makefile
index 9d4f3b7f141..31f2d5e8fc2 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/memory-region/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/memory-region/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/functionalities/memory/cache/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/memory/cache/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/memory/cache/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/memory/cache/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/memory/find/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/memory/find/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/memory/find/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/memory/find/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/memory/read/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/memory/read/Makefile
index 314f1cb2f07..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/memory/read/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/memory/read/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/Makefile
index 5665652329d..5a7351146d2 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../make
-
OBJC_SOURCES := main.m
LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -framework AppKit
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/Makefile
index 8a7102e347a..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/Makefile
index 8af06446ece..3119c370784 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/Makefile
@@ -1,8 +1,6 @@
-LEVEL = ../../../make
-
DYLIB_CXX_SOURCES := plugin.cpp
DYLIB_NAME := plugin
DYLIB_ONLY := YES
MAKE_DSYM := NO
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/Makefile
index cd9ca5c86d8..c9319d6e688 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/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/functionalities/postmortem/elf-core/gcore/main.mk b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/main.mk
index ff874a21f76..566938ca0cc 100755
--- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/main.mk
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/main.mk
@@ -1,5 +1,3 @@
-LEVEL = ../../../../make
-
CXX_SOURCES := main.cpp
ENABLE_THREADS := YES
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/main.mk b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/main.mk
index ff874a21f76..566938ca0cc 100755
--- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/main.mk
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/main.mk
@@ -1,5 +1,3 @@
-LEVEL = ../../../../make
-
CXX_SOURCES := main.cpp
ENABLE_THREADS := YES
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/Makefile
index b3034c12abd..65e9dd2fa9e 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/Makefile
index 624a6e1584e..032f9cda29c 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../make
-
DYLIB_NAME := unlikely_name
DYLIB_CXX_SOURCES := foo.cpp
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_group/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/process_group/Makefile
index 0d70f259501..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/process_group/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/process_group/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/functionalities/process_save_core/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/process_save_core/Makefile
index b76d2cdb93f..65e9dd2fa9e 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/process_save_core/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/process_save_core/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/ptr_refs/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/ptr_refs/Makefile
index 0d70f259501..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/ptr_refs/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/ptr_refs/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/functionalities/recursion/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/recursion/Makefile
index 8a7102e347a..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/recursion/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/recursion/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/rerun/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/rerun/Makefile
index 8a7102e347a..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/rerun/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/rerun/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/return-value/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/return-value/Makefile
index fd4e3086346..138642ce206 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/return-value/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/return-value/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../make
-
CXX_SOURCES := call-func.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/set-data/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/set-data/Makefile
index 9e1d63a183b..7202932571d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/set-data/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/set-data/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../make
-
OBJC_SOURCES := main.m
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/signal/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/signal/Makefile
index 0d70f259501..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/signal/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/signal/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/functionalities/signal/handle-abrt/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-abrt/Makefile
index b09a579159d..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-abrt/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-abrt/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/functionalities/signal/handle-segv/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/Makefile
index b09a579159d..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/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/functionalities/signal/raise/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/signal/raise/Makefile
index b09a579159d..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/signal/raise/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/signal/raise/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/functionalities/stats_api/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/stats_api/Makefile
index f5a47fcc46c..c9319d6e688 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/stats_api/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/stats_api/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/functionalities/step-avoids-no-debug/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/Makefile
index 4f71dc87646..374e58b89a8 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/Makefile
@@ -1,8 +1,6 @@
-LEVEL = ../../make
-
C_SOURCES := with-debug.c without-debug.c
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
without-debug.o: without-debug.c
$(CC) $(CFLAGS_NO_DEBUG) -c $<
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/step_scripted/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/step_scripted/Makefile
index 0d70f259501..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/step_scripted/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/step_scripted/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/functionalities/tail_call_frames/ambiguous_tail_call_seq1/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq1/Makefile
index 15bc2e7f415..41c46c6626b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq1/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq1/Makefile
@@ -1,4 +1,3 @@
-LEVEL = ../../../make
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
CXXFLAGS += -g -O1 -glldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq2/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq2/Makefile
index 15bc2e7f415..41c46c6626b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq2/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq2/Makefile
@@ -1,4 +1,3 @@
-LEVEL = ../../../make
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
CXXFLAGS += -g -O1 -glldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_call_site/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_call_site/Makefile
index 15bc2e7f415..41c46c6626b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_call_site/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_call_site/Makefile
@@ -1,4 +1,3 @@
-LEVEL = ../../../make
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
CXXFLAGS += -g -O1 -glldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/Makefile
index 15bc2e7f415..41c46c6626b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/Makefile
@@ -1,4 +1,3 @@
-LEVEL = ../../../make
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
CXXFLAGS += -g -O1 -glldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_tail_call_seq/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_tail_call_seq/Makefile
index 15bc2e7f415..41c46c6626b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_tail_call_seq/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_tail_call_seq/Makefile
@@ -1,4 +1,3 @@
-LEVEL = ../../../make
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
CXXFLAGS += -g -O1 -glldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/inlining_and_tail_calls/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/inlining_and_tail_calls/Makefile
index 15bc2e7f415..41c46c6626b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/inlining_and_tail_calls/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/inlining_and_tail_calls/Makefile
@@ -1,4 +1,3 @@
-LEVEL = ../../../make
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
CXXFLAGS += -g -O1 -glldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/sbapi_support/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/sbapi_support/Makefile
index 15bc2e7f415..41c46c6626b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/sbapi_support/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/sbapi_support/Makefile
@@ -1,4 +1,3 @@
-LEVEL = ../../../make
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
CXXFLAGS += -g -O1 -glldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_message/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_message/Makefile
index 15bc2e7f415..41c46c6626b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_message/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_message/Makefile
@@ -1,4 +1,3 @@
-LEVEL = ../../../make
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
CXXFLAGS += -g -O1 -glldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_or_return/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_or_return/Makefile
index 15bc2e7f415..41c46c6626b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_or_return/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_or_return/Makefile
@@ -1,4 +1,3 @@
-LEVEL = ../../../make
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
CXXFLAGS += -g -O1 -glldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/unambiguous_sequence/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/unambiguous_sequence/Makefile
index 15bc2e7f415..41c46c6626b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/unambiguous_sequence/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/unambiguous_sequence/Makefile
@@ -1,4 +1,3 @@
-LEVEL = ../../../make
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
CXXFLAGS += -g -O1 -glldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/target-new-solib-notifications/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/target-new-solib-notifications/Makefile
index 8a7102e347a..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/target-new-solib-notifications/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/target-new-solib-notifications/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/target_var/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/target_var/Makefile
index bb9cc4f2f66..806c96740af 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/target_var/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/target_var/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../make
-
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
a.out: globals.ll
$(CC) $(CFLAGS) -g -c $^ -o globals.o
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile
index 24e68012ebd..78f60047cd7 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../make
-
CXXFLAGS += -std=c++11
CXX_SOURCES := ParallelTask.cpp
ENABLE_THREADS := YES
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/Makefile
index f0bcf9752de..1e84d63f106 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../make
-
CXXFLAGS += -std=c++11
CXX_SOURCES := main.cpp
ENABLE_THREADS := YES
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile
index 67aa16625bf..566938ca0cc 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
ENABLE_THREADS := YES
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/Makefile
index 469c0809aa2..c33ae5685ef 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
ENABLE_THREADS := YES
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/Makefile
index 26db4816b6e..3d0b98f13f3 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/Makefile
@@ -1,4 +1,2 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile
index 67aa16625bf..566938ca0cc 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
ENABLE_THREADS := YES
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/Makefile
index 67aa16625bf..566938ca0cc 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
ENABLE_THREADS := YES
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/Makefile
index 67aa16625bf..566938ca0cc 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
ENABLE_THREADS := YES
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/Makefile
index d06a7d4685f..ebecfbf9241 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
ENABLE_THREADS := YES
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/Makefile
index b726fc3695f..6e962b97209 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
ENABLE_THREADS := YES
CXX_SOURCES := main.cpp other.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/Makefile
index 67aa16625bf..566938ca0cc 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
ENABLE_THREADS := YES
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/num_threads/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/num_threads/Makefile
index 67aa16625bf..566938ca0cc 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/num_threads/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/num_threads/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
ENABLE_THREADS := YES
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/state/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/state/Makefile
index 26db4816b6e..3d0b98f13f3 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/state/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/state/Makefile
@@ -1,4 +1,2 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/Makefile
index 035413ff763..c46619c6623 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
ENABLE_THREADS := YES
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_until/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_until/Makefile
index b09a579159d..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_until/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_until/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/functionalities/thread/thread_exit/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/Makefile
index d06a7d4685f..ebecfbf9241 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
-
ENABLE_THREADS := YES
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/Makefile
index 035413ff763..c46619c6623 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
ENABLE_THREADS := YES
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break_plus_condition/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break_plus_condition/Makefile
index 035413ff763..c46619c6623 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break_plus_condition/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break_plus_condition/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
ENABLE_THREADS := YES
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/basic/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/basic/Makefile
index c930ae563fc..07133cff358 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/basic/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/basic/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../make
-
C_SOURCES := main.c
CFLAGS_EXTRAS := -fsanitize=thread -g
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/cpp_global_location/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/cpp_global_location/Makefile
index a5819477907..5f671971d59 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/cpp_global_location/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/cpp_global_location/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../make
-
CXX_SOURCES := main.cpp
CFLAGS_EXTRAS := -fsanitize=thread -g
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/global_location/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/global_location/Makefile
index c930ae563fc..07133cff358 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/global_location/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/global_location/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../make
-
C_SOURCES := main.c
CFLAGS_EXTRAS := -fsanitize=thread -g
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/multiple/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/multiple/Makefile
index c930ae563fc..07133cff358 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/multiple/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/multiple/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../make
-
C_SOURCES := main.c
CFLAGS_EXTRAS := -fsanitize=thread -g
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_leak/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_leak/Makefile
index c930ae563fc..07133cff358 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_leak/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_leak/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../make
-
C_SOURCES := main.c
CFLAGS_EXTRAS := -fsanitize=thread -g
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_numbers/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_numbers/Makefile
index c930ae563fc..07133cff358 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_numbers/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_numbers/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../make
-
C_SOURCES := main.c
CFLAGS_EXTRAS := -fsanitize=thread -g
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tty/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tty/Makefile
index 0d70f259501..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tty/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tty/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/functionalities/type_completion/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/type_completion/Makefile
index 8a7102e347a..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/type_completion/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/type_completion/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/Makefile
index 7fb4d7a5ab1..377a1a0373a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/Makefile
@@ -1,9 +1,7 @@
-LEVEL = ../../make
-
OBJCXX_SOURCES := main.mm
CFLAGS_EXTRAS += -w
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/ubsan/basic/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/ubsan/basic/Makefile
index 6e7d19b6f48..b27db90a40d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/ubsan/basic/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/ubsan/basic/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../make
-
C_SOURCES := main.c
CFLAGS_EXTRAS := -fsanitize=undefined -g
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/ubsan/user-expression/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/ubsan/user-expression/Makefile
index 6e7d19b6f48..b27db90a40d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/ubsan/user-expression/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/ubsan/user-expression/Makefile
@@ -1,6 +1,4 @@
-LEVEL = ../../../make
-
C_SOURCES := main.c
CFLAGS_EXTRAS := -fsanitize=undefined -g
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/ehframe/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/ehframe/Makefile
index 289d25698ff..493ea3f7f68 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/ehframe/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/ehframe/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../make
-
C_SOURCES := main.c
CFLAGS ?= -g -fomit-frame-pointer
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/Makefile
index ede25f029bc..36cf5a296e5 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/Makefile
@@ -1,7 +1,5 @@
-LEVEL = ../../../make
-
C_SOURCES := main.c
CFLAGS ?= -g -Os
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/Makefile
index b09a579159d..10495940055 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/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/functionalities/unwind/standard/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/Makefile
index 146da30b12c..22f1051530f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/Makefile
@@ -1,3 +1 @@
-LEVEL = ../../../make
-
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/value_md5_crash/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/value_md5_crash/Makefile
index 8a7102e347a..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/value_md5_crash/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/value_md5_crash/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/var_path/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/var_path/Makefile
index 8a7102e347a..99998b20bcb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/var_path/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/var_path/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../make
-
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
OpenPOWER on IntegriCloud