diff options
| author | Pavel Labath <pavel@labath.sk> | 2019-09-04 07:46:25 +0000 |
|---|---|---|
| committer | Pavel Labath <pavel@labath.sk> | 2019-09-04 07:46:25 +0000 |
| commit | 418a272f4ab4221c37a9272d48fd31d5ac1bddc1 (patch) | |
| tree | 1bcc614932022201607d7f9e3f148f3c27cc5b14 /lldb/packages/Python/lldbsuite/test/commands | |
| parent | 5bfe8b562ffb33fc09fa4a4c62f0146087d16ef6 (diff) | |
| download | bcm5719-llvm-418a272f4ab4221c37a9272d48fd31d5ac1bddc1.tar.gz bcm5719-llvm-418a272f4ab4221c37a9272d48fd31d5ac1bddc1.zip | |
[dotest] Avoid the need for LEVEL= makefile boilerplate
Summary:
Instead of each test case knowing its depth relative to the test root,
we can just have dotest add the folder containing Makefile.rules to the
include path.
This was motivated by r370616, though I have been wanting to do this
ever since we moved to building tests out-of-tree.
The only manually modified files in this patch are lldbinline.py and
plugins/builder_base.py. The rest of the patch has been produced by this
shell command:
find . \( -name Makefile -o -name '*.mk' \) -exec sed --in-place -e '/LEVEL *:\?=/d' -e '1,2{/^$/d}' -e 's,\$(LEVEL)/,,' {} +
Reviewers: teemperor, aprantl, espindola, jfb
Subscribers: emaste, javed.absar, arichardson, christof, arphaman, lldb-commits
Differential Revision: https://reviews.llvm.org/D67083
llvm-svn: 370845
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/commands')
135 files changed, 135 insertions, 366 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/commands/add-dsym/uuid/Makefile b/lldb/packages/Python/lldbsuite/test/commands/add-dsym/uuid/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/add-dsym/uuid/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/add-dsym/uuid/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/Makefile b/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/Makefile index a6376f9b165..8d669cbfd2b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c a.c b.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/Makefile b/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/Makefile b/lldb/packages/Python/lldbsuite/test/commands/command/script/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/command/script/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/command/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/commands/command/script/import/Makefile b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/Makefile index 9374aef487f..d9ee1cc4116 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c EXE := hello_world -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/Makefile b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/Makefile index 7913aaa4b74..22f1051530f 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/Makefile @@ -1,3 +1 @@ -LEVEL = ../../../../make - -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/Makefile index 6e8e801af01..31f2d5e8fc2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules clean:: rm -rf $(wildcard *.o *.d *.dSYM) diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-overridden-method/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/call-overridden-method/Makefile index 6e8e801af01..31f2d5e8fc2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/call-overridden-method/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-overridden-method/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules clean:: rm -rf $(wildcard *.o *.d *.dSYM) diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/Makefile index e56f0ab614d..fa5901ebca1 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := lotta-signals.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile index c47338f0f13..33746217ecb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := call-throws.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/char/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/char/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/char/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/char/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-incomplete-record/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-incomplete-record/Makefile index 99bfa7e03b4..3d0b98f13f3 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-incomplete-record/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-incomplete-record/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-lambda/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-lambda/Makefile index 99bfa7e03b4..3d0b98f13f3 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-lambda/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-lambda/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash1/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash1/Makefile index 99bfa7e03b4..3d0b98f13f3 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash1/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash1/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash2/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash2/Makefile index 99bfa7e03b4..3d0b98f13f3 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash2/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash2/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/completion/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/completion/Makefile index feebe26aad1..020dce7c31d 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/completion/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp other.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/Makefile index 242d36fe860..2f36b673031 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/context-object/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/context-object/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/Makefile index cd9ca5c86d8..c9319d6e688 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/Makefile index 6067ee45e98..aa5f222c08e 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS += -std=c99 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/fixits/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/fixits/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/fixits/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/fixits/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-basic/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-basic/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-basic/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-basic/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile index 855bda52986..459a66c5c8b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../../make # We don't have any standard include directories, so we can't # parse the test_common.h header we usually inject as it includes # system headers. @@ -7,4 +6,4 @@ NO_TEST_COMMON_H := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXXFLAGS += -I $(SRCDIR)/root/usr/include/c++/include/ -I $(SRCDIR)/root/usr/include/ -nostdinc -nostdinc++ -nostdlib++ CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-basic/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-basic/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/Makefile index 6ed2bcfcffc..12e489d83b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile index 82e0d19a035..780b2660cd0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Cocoa diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/Makefile index 9884d7d20b1..a1f689e07c7 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../make
CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/Makefile index 53303eaf4f8..00a9da08656 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - default: a.out C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/macros/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/macros/Makefile index 518045730b4..59070728a5f 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/macros/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/macros/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp DEBUG_INFO_FLAG = -g3 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/Makefile index cd9ca5c86d8..c9319d6e688 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/Makefile index e486bedb9b0..9267f734396 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../make OBJCXX_SOURCES := main.mm util.mm -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/Makefile index f48ae861ae2..f63adb4f5d2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := locking.c ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/options/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/options/Makefile index 457c4972f2d..7df22699c57 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/options/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/options/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp foo.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/Makefile index 864f1c8223c..add737b4752 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation -framework CloudKit diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/Makefile index f3d1687cd9f..549336d0223 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile index 242d36fe860..2f36b673031 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/Makefile index cd9ca5c86d8..c9319d6e688 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/rdar44436068/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar44436068/Makefile index cd9ca5c86d8..c9319d6e688 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/rdar44436068/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar44436068/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile index 80d2f745dad..4b46fe22a8b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/test/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/test/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/test/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/test/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/Makefile index 49138c83c69..06a21f5b8b4 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := wait-a-while.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/Makefile index 68fb539d6d8..1247a8e09b2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp test.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules a.out: dummy diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/dummy.mk b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/dummy.mk index 851e96e6f3a..59a1cff3803 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/dummy.mk +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/dummy.mk @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES := dummy.cpp EXE := dummy -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile index 22a6e017765..b8b1d12fe2b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m foo.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/Makefile index 7cc295cc1f4..7fdd5c2c6ab 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp CXX_FLAGS_EXTRA := -finput-charset=UTF-8 -fextended-identifiers -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/Makefile index 32f0e9a13ef..9786ff38a84 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/Makefile @@ -1,7 +1,6 @@ -LEVEL = ../../../make CFLAGS_EXTRAS += -std=c99 LD_FLAGS := -dynamiclib -include $(LEVEL)/Makefile.rules +include Makefile.rules all: a.out dylib missing diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/array/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/array/Makefile index 214cedd96f1..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/array/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/array/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/Makefile index ee6b9cc62b4..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/Makefile index 214cedd96f1..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/Makefile index 214cedd96f1..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/Makefile index ee6b9cc62b4..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/Makefile index ee6b9cc62b4..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/Makefile index ee6b9cc62b4..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/Makefile index 214cedd96f1..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/Makefile index ee6b9cc62b4..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/language/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/language/Makefile index 127cea792d2..993dc3f71a8 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/language/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/language/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp other.cpp other-2.cpp C_SOURCES := somefunc.c -include $(LEVEL)/Makefile.rules +include Makefile.rules other-2.o: other-2.cpp $(CXX) $(CFLAGS_NO_DEBUG) -c $(SRCDIR)/other-2.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/Makefile index 5f36c6a9a68..b016328910e 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/Makefile @@ -1,10 +1,8 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m CFLAGS_EXTRAS += -g0 # No debug info. MAKE_DSYM := NO -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/select/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/select/Makefile index 99bfa7e03b4..3d0b98f13f3 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/select/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/select/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/var-scope/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/var-scope/Makefile index cd9ca5c86d8..c9319d6e688 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/var-scope/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/var-scope/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/var/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/var/Makefile index 6067ee45e98..aa5f222c08e 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/var/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/var/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS += -std=c99 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/gui/basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/gui/basic/Makefile index cd9ca5c86d8..c9319d6e688 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/gui/basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/gui/basic/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/log/basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/log/basic/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/log/basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/log/basic/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/Makefile b/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/Makefile index ea27ca7dec2..dc1d28d1c03 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES EXE := AttachResume -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/attach/Makefile b/lldb/packages/Python/lldbsuite/test/commands/process/attach/Makefile index 91c895cf68d..8a52f8fcd47 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/process/attach/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/process/attach/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp EXE := ProcessAttach -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/Makefile b/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/Makefile index d7926a98402..a694d36ac0d 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/Makefile @@ -1,12 +1,10 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp EXE := AttachDenied all: AttachDenied sign -include $(LEVEL)/Makefile.rules +include Makefile.rules sign: entitlements.plist AttachDenied ifeq ($(OS),Darwin) diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/Makefile b/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/launch/Makefile b/lldb/packages/Python/lldbsuite/test/commands/process/launch/Makefile index 54d1c2bf7f3..eff77274c7b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/process/launch/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/process/launch/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp #CXX_SOURCES := print-cwd.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/Makefile b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/Makefile index 1c1be94b3d0..202f88e410e 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CFLAGS_EXTRAS += -mmpx -fcheck-pointer-bounds -fuse-ld=bfd -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/Makefile b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/Makefile index aa88c47ff3f..202f88e410e 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp CFLAGS_EXTRAS += -mmpx -fcheck-pointer-bounds -fuse-ld=bfd -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/Makefile b/lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/Makefile index 3ff68584fd8..d2bc2ba44a0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp a.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/settings/Makefile b/lldb/packages/Python/lldbsuite/test/commands/settings/Makefile index 8a7102e347a..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/settings/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/settings/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/settings/quoting/Makefile b/lldb/packages/Python/lldbsuite/test/commands/settings/quoting/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/settings/quoting/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/settings/quoting/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/source/info/Makefile b/lldb/packages/Python/lldbsuite/test/commands/source/info/Makefile index faf0ed5765f..40543b2593f 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/source/info/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/source/info/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp second.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/statistics/basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/statistics/basic/Makefile index cd9ca5c86d8..c9319d6e688 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/statistics/basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/statistics/basic/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/target/basic/Makefile index 59375dd6db8..b31e594019f 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/target/basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/target/basic/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - # Example: # # C_SOURCES := b.c # EXE := b.out -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/Makefile b/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/Makefile index ca017e07ae3..aa9922b390a 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/Makefile @@ -1,11 +1,9 @@ -LEVEL := ../../../make - LIB_PREFIX := load_ LD_EXTRAS := -L. -l$(LIB_PREFIX)a CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules a.out: lib_a diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/a.mk b/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/a.mk index faec3bbfc3e..80756bbe8f2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/a.mk +++ b/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/a.mk @@ -1,9 +1,7 @@ -LEVEL := ../../../make - LIB_PREFIX := load_ DYLIB_NAME := $(LIB_PREFIX)a DYLIB_CXX_SOURCES := a.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/Makefile b/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/Makefile b/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/Makefile index 6067ee45e98..aa5f222c08e 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS += -std=c99 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/Makefile index 8817fff55e8..de4ec12b13c 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_threads/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_threads/Makefile index 8817fff55e8..de4ec12b13c 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_threads/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_threads/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/Makefile index ee6b9cc62b4..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/Makefile index ee6b9cc62b4..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/Makefile index 8817fff55e8..de4ec12b13c 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules |
