diff options
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test')
10 files changed, 17 insertions, 91 deletions
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 ced3f7aab56..69dde1b7618 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,13 +1,12 @@ LEVEL = ../../../make CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 + +# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD +# targets. Other targets do not, which causes this test to fail. +# This flag enables FullDebugInfo for all targets. ifneq (,$(findstring clang,$(CC))) - CFLAGS_EXTRAS += -fno-limit-debug-info + CFLAGS_EXTRAS += -fno-limit-debug-info endif include $(LEVEL)/Makefile.rules - - -cleanup: - rm -f Makefile *.d - 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 23b1e08598b..62a57f6cd9b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/Makefile @@ -1,13 +1,4 @@ LEVEL = ../../../make OBJC_SOURCES := main.m -LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -ifneq (,$(findstring clang,$(CC))) - CFLAGS_EXTRAS += -fno-limit-debug-info -endif - include $(LEVEL)/Makefile.rules - - -cleanup: - rm -f Makefile *.d - +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 ced3f7aab56..69dde1b7618 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/Makefile @@ -1,13 +1,12 @@ LEVEL = ../../../make CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 + +# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD +# targets. Other targets do not, which causes this test to fail. +# This flag enables FullDebugInfo for all targets. ifneq (,$(findstring clang,$(CC))) - CFLAGS_EXTRAS += -fno-limit-debug-info + CFLAGS_EXTRAS += -fno-limit-debug-info endif include $(LEVEL)/Makefile.rules - - -cleanup: - rm -f Makefile *.d - 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 ced3f7aab56..3e2b0187b95 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,13 +1,4 @@ LEVEL = ../../../make CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 -ifneq (,$(findstring clang,$(CC))) - CFLAGS_EXTRAS += -fno-limit-debug-info -endif - include $(LEVEL)/Makefile.rules - - -cleanup: - rm -f Makefile *.d - diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/Makefile index e2eb16515a6..cd9ca5c86d8 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/Makefile @@ -1,12 +1,3 @@ LEVEL = ../../../make C_SOURCES := main.c -ifneq (,$(findstring clang,$(CC))) - CFLAGS_EXTRAS += -fno-limit-debug-info -endif - include $(LEVEL)/Makefile.rules - - -cleanup: - rm -f Makefile *.d - diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/const_this/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/const_this/Makefile index ced3f7aab56..52a92c0b61a 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/const_this/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/const_this/Makefile @@ -1,13 +1,8 @@ LEVEL = ../../../make CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 -ifneq (,$(findstring clang,$(CC))) - CFLAGS_EXTRAS += -fno-limit-debug-info -endif - include $(LEVEL)/Makefile.rules - cleanup: rm -f Makefile *.d diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/extern_c/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/extern_c/Makefile index ced3f7aab56..99bfa7e03b4 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/extern_c/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/extern_c/Makefile @@ -1,13 +1,3 @@ LEVEL = ../../../make CXX_SOURCES := main.cpp -CXXFLAGS += -std=c++11 -ifneq (,$(findstring clang,$(CC))) - CFLAGS_EXTRAS += -fno-limit-debug-info -endif - include $(LEVEL)/Makefile.rules - - -cleanup: - rm -f Makefile *.d - diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile index 23b1e08598b..a1608fe5a66 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile @@ -1,13 +1,6 @@ LEVEL = ../../../make + OBJC_SOURCES := main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -ifneq (,$(findstring clang,$(CC))) - CFLAGS_EXTRAS += -fno-limit-debug-info -endif include $(LEVEL)/Makefile.rules - - -cleanup: - rm -f Makefile *.d - diff --git a/lldb/packages/Python/lldbsuite/test/lldbinline.py b/lldb/packages/Python/lldbsuite/test/lldbinline.py index 8d619cf829d..6a61b2eaf55 100644 --- a/lldb/packages/Python/lldbsuite/test/lldbinline.py +++ b/lldb/packages/Python/lldbsuite/test/lldbinline.py @@ -2,9 +2,7 @@ from __future__ import print_function from __future__ import absolute_import # System modules -import filecmp import os -import sys # Third-party modules @@ -91,6 +89,9 @@ class InlineTest(TestBase): return "-N dsym %s" % (self.mydir) def BuildMakefile(self): + if os.path.exists("Makefile"): + return + categories = {} for f in os.listdir(os.getcwd()): @@ -101,7 +102,7 @@ class InlineTest(TestBase): else: categories[t] = [f] - makefile = open("Makefile.tmp", 'w+') + makefile = open("Makefile", 'w+') level = os.sep.join([".."] * len(self.mydir.split(os.sep))) + os.sep + "make" @@ -117,26 +118,11 @@ class InlineTest(TestBase): if ('CXX_SOURCES' in list(categories.keys())): makefile.write("CXXFLAGS += -std=c++11\n") - # clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD - # targets. Other targets do not, which causes this test to fail. - # This flag enables FullDebugInfo for all targets. - - makefile.write("ifneq (,$(findstring clang,$(CC)))\n") - makefile.write(" CFLAGS_EXTRAS += -fno-limit-debug-info\n") - makefile.write("endif\n\n") - - makefile.write("include $(LEVEL)/Makefile.rules\n\n") - + makefile.write("include $(LEVEL)/Makefile.rules\n") makefile.write("\ncleanup:\n\trm -f Makefile *.d\n\n") makefile.flush() makefile.close() - if os.path.exists("Makefile"): - if not filecmp.cmp("Makefile", "Makefile.tmp"): - sys.exit("Existing Makefile doesn't match generated Makefile!") - - os.rename("Makefile.tmp", "Makefile") - @skipUnlessDarwin def __test_with_dsym(self): self.using_dsym = True diff --git a/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/Makefile index 18bf477fa9f..a9c1edd1bdc 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/Makefile @@ -1,13 +1,4 @@ LEVEL = ../../make CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 -ifneq (,$(findstring clang,$(CC))) - CFLAGS_EXTRAS += -fno-limit-debug-info -endif - include $(LEVEL)/Makefile.rules - - -cleanup: - rm -f Makefile *.d - |
