From baf54a8ad5710d54bc6cc8fd2e7f1fcfabc9c503 Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Wed, 21 Oct 2015 12:56:37 +0000 Subject: [PATCH] Clean up more .dwo files after the tests run llvm-svn: 250896 --- lldb/test/lang/cpp/incomplete-types/Makefile | 2 +- lldb/test/make/Makefile.rules | 2 +- lldb/test/types/AbstractBase.py | 3 --- lldb/test/types/TestRecursiveTypes.py | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lldb/test/lang/cpp/incomplete-types/Makefile b/lldb/test/lang/cpp/incomplete-types/Makefile index 409669d0445d..6595e33b7269 100644 --- a/lldb/test/lang/cpp/incomplete-types/Makefile +++ b/lldb/test/lang/cpp/incomplete-types/Makefile @@ -30,6 +30,6 @@ length_nolimit.o: length.cpp a.o: a.cpp $(CXX) $(CFLAGS_NO_DEBUG) -c a.cpp -o a.o -clean: OBJECTS += limit nolimit length_limit.o length_nolimit.o +clean: OBJECTS += limit nolimit length_limit.o length_nolimit.o length_limit.dwo length_nolimit.dwo include $(LEVEL)/Makefile.rules diff --git a/lldb/test/make/Makefile.rules b/lldb/test/make/Makefile.rules index 8a433a898f14..796a7a0453ee 100644 --- a/lldb/test/make/Makefile.rules +++ b/lldb/test/make/Makefile.rules @@ -489,7 +489,7 @@ endif # files by replacing all .c files with .d. #---------------------------------------------------------------------- PREREQS := $(OBJECTS:.o=.d) -DWOS := $(OBJECTS:.o=.dwo) +DWOS := $(OBJECTS:.o=.dwo) $(ARCHIVE_OBJECTS:.o=.dwo) ifneq "$(DYLIB_NAME)" "" DYLIB_PREREQS := $(DYLIB_OBJECTS:.o=.d) DYLIB_DWOS := $(DYLIB_OBJECTS:.o=.dwo) diff --git a/lldb/test/types/AbstractBase.py b/lldb/test/types/AbstractBase.py index 5b1d9b88c69b..a4dc1a860048 100644 --- a/lldb/test/types/AbstractBase.py +++ b/lldb/test/types/AbstractBase.py @@ -46,9 +46,6 @@ class GenericTester(TestBase): # functions. There are also three optional keyword arguments of interest, # # as follows: # # # - # dsym -> build for dSYM (defaulted to True) # - # True: build dSYM file # - # False: build DWARF map # # bc -> blockCaptured (defaulted to False) # # True: testing vars of various basic types from inside a block # # False: testing vars of various basic types from a function # diff --git a/lldb/test/types/TestRecursiveTypes.py b/lldb/test/types/TestRecursiveTypes.py index 97795a8a0bba..5ded66d80c25 100644 --- a/lldb/test/types/TestRecursiveTypes.py +++ b/lldb/test/types/TestRecursiveTypes.py @@ -33,7 +33,7 @@ class RecursiveTypesTestCase(TestBase): def test_recursive_type_2(self): """Test that recursive structs are displayed correctly.""" - self.build(dictionary=self.d1) + self.build(dictionary=self.d2) self.setTearDownCleanup(dictionary=self.d2) self.print_struct()