[Lldb-commits] [lldb] 68cc9f8 - [lldb] Remove all 'clean' targets from test Makefiles

Raphael Isemann via lldb-commits lldb-commits at lists.llvm.org
Fri Feb 7 02:25:14 PST 2020 

Author: Raphael Isemann
Date: 2020-02-07T11:24:52+01:00
New Revision: 68cc9f80a6bfd7b88a761d29c757d0ec6544e126

URL: https://github.com/llvm/llvm-project/commit/68cc9f80a6bfd7b88a761d29c757d0ec6544e126
DIFF: https://github.com/llvm/llvm-project/commit/68cc9f80a6bfd7b88a761d29c757d0ec6544e126.diff

LOG: [lldb] Remove all 'clean' targets from test Makefiles

Summary:
To my knowledge we don't actually use or need these rules. And if we need them then
there is probably a better way to implement this than having all these random regexes.

Reviewers: labath, JDevlieghere

Reviewed By: labath, JDevlieghere

Subscribers: jingham, lldb-commits

Tags: #lldb

Differential Revision: https://reviews.llvm.org/D74126

Added: 
    

Modified: 
    lldb/packages/Python/lldbsuite/test/api/multithreaded/Makefile
    lldb/packages/Python/lldbsuite/test/commands/expression/call-function/Makefile
    lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/Makefile
    lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile
    lldb/packages/Python/lldbsuite/test/functionalities/memory-region/Makefile
    lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_dso/Makefile
    lldb/packages/Python/lldbsuite/test/functionalities/target_var/Makefile
    lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Makefile
    lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/Makefile
    lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/Makefile
    lldb/packages/Python/lldbsuite/test/lang/cpp/overriden-methods/Makefile
    lldb/packages/Python/lldbsuite/test/lang/cpp/stl/Makefile
    lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/Makefile
    lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/Makefile
    lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile
    lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/Makefile
    lldb/packages/Python/lldbsuite/test/linux/add-symbols/Makefile
    lldb/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile
    lldb/packages/Python/lldbsuite/test/linux/sepdebugsymlink/Makefile
    lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/Makefile
    lldb/packages/Python/lldbsuite/test/macosx/universal/Makefile
    lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/Makefile
    lldb/packages/Python/lldbsuite/test/python_api/formatters/Makefile
    lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/Makefile
    lldb/packages/Python/lldbsuite/test/source-manager/Makefile

Removed: 
    


################################################################################
diff  --git a/lldb/packages/Python/lldbsuite/test/api/multithreaded/Makefile b/lldb/packages/Python/lldbsuite/test/api/multithreaded/Makefile
index 817672190672..de4ec12b13cb 100644
--- a/lldb/packages/Python/lldbsuite/test/api/multithreaded/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/api/multithreaded/Makefile
@@ -2,6 +2,3 @@ ENABLE_THREADS := YES
 CXX_SOURCES := main.cpp
 
 include Makefile.rules
-
-clean::
-	rm -rf $(wildcard *.o *.d *.dSYM)

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 31f2d5e8fc29..99998b20bcb0 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/Makefile
@@ -1,6 +1,3 @@
 CXX_SOURCES := main.cpp
 
 include Makefile.rules
-
-clean::
-	rm -rf $(wildcard *.o *.d *.dSYM)

diff  --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/Makefile
index 7c6a18b0f24d..1c42301c7b58 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/Makefile
@@ -7,6 +7,3 @@ include Makefile.rules
 # Force relative filenames by copying it into the build directory.
 relative.cpp: main.cpp
 	cp -f $< $@
-
-clean::
-	rm -rf relative.cpp

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 3767ff17e35b..7bc4d866a0d5 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile
@@ -3,6 +3,3 @@ CFLAGS_EXTRAS := -w
 LD_EXTRAS := -framework Foundation
 
 include Makefile.rules
-
-clean::
-	rm -rf $(wildcard *.o *.d *.dSYM *.log)

diff  --git a/lldb/packages/Python/lldbsuite/test/functionalities/memory-region/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/memory-region/Makefile
index 31f2d5e8fc29..99998b20bcb0 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/memory-region/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/memory-region/Makefile
@@ -1,6 +1,3 @@
 CXX_SOURCES := main.cpp
 
 include Makefile.rules
-
-clean::
-	rm -rf $(wildcard *.o *.d *.dSYM)

diff  --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_dso/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_dso/Makefile
index fd44eb4be9c3..dee13db1f716 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_dso/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/cross_dso/Makefile
@@ -11,7 +11,3 @@ lib_One: lib_Two
 
 lib_%:
 	$(MAKE) VPATH=$(SRCDIR)/$* -I $(SRCDIR) -f $(SRCDIR)/$*.mk DSYMUTIL=$(DSYMUTIL)
-
-clean::
-	$(MAKE) -f $(SRCDIR)/One.mk clean
-	$(MAKE) -f $(SRCDIR)/Two.mk clean

diff  --git a/lldb/packages/Python/lldbsuite/test/functionalities/target_var/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/target_var/Makefile
index 806c96740af1..e51de3a02a46 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/target_var/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/target_var/Makefile
@@ -3,6 +3,3 @@ include Makefile.rules
 a.out: globals.ll
 	$(CC) $(CFLAGS) -g -c $^ -o globals.o
 	$(LD) $(LDFLAGS) -g globals.o -o $@
-
-clean::
-	rm -rf globals.o a.out *.dSYM

diff  --git a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Makefile
index 59778ab5d9f1..81594a1265da 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Makefile
@@ -8,7 +8,3 @@ a.out: lib_One lib_Two
 
 lib_%:
 	$(MAKE) VPATH=$(SRCDIR)/$* -I $(SRCDIR) -f $(SRCDIR)/$*.mk
-
-clean::
-	$(MAKE) -f $(SRCDIR)/One.mk clean
-	$(MAKE) -f $(SRCDIR)/Two.mk clean

diff  --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/Makefile
index 64fd6effcee4..80865c0c8524 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/Makefile
@@ -1,6 +1,4 @@
 CXX_SOURCES := main.cpp
 CFLAGS :=-g -O0 -std=c++11
 
-clean: OBJECTS+=$(wildcard main.d.*)
-
 include Makefile.rules

diff  --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/Makefile
index a02c72adc202..e891bb25dd91 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/Makefile
@@ -2,8 +2,4 @@ CXX_SOURCES := main.cpp
 
 CXXFLAGS_EXTRAS := -std=c++11
 
-clean: OBJECTS+=$(wildcard main.d.*)
-
-
-
 include Makefile.rules

diff  --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/overriden-methods/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/overriden-methods/Makefile
index 31f2d5e8fc29..99998b20bcb0 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/overriden-methods/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/overriden-methods/Makefile
@@ -1,6 +1,3 @@
 CXX_SOURCES := main.cpp
 
 include Makefile.rules
-
-clean::
-	rm -rf $(wildcard *.o *.d *.dSYM)

diff  --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/Makefile
index a4b03ae0aab2..4617d67aca29 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/Makefile
@@ -1,6 +1,4 @@
 CXX_SOURCES := main.cpp
 CFLAGS := -g -O0
 
-clean: OBJECTS+=$(wildcard main.d.*)
-
 include Makefile.rules

diff  --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/Makefile
index bf443d855cef..f7370ec3c3b4 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/Makefile
@@ -1,6 +1,4 @@
 CXX_SOURCES := main.cpp
 CFLAGS := -g -O0 -std=c++11
 
-clean: OBJECTS+=$(wildcard main.d.*)
-
 include Makefile.rules

diff  --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/Makefile
index a4b03ae0aab2..4617d67aca29 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/Makefile
@@ -1,6 +1,4 @@
 CXX_SOURCES := main.cpp
 CFLAGS := -g -O0
 
-clean: OBJECTS+=$(wildcard main.d.*)
-
 include Makefile.rules

diff  --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile
index a218ce37e61d..0aaa021132e1 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile
@@ -6,8 +6,4 @@ all:        a.out.stripped
 a.out.stripped: a.out.dSYM
 	strip -o a.out.stripped a.out
 
-clean::
-	rm -f a.out.stripped
-	rm -rf a.out.stripped.dSYM
-
 include Makefile.rules

diff  --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/Makefile
index 0ad7e3563167..ed312938c9cd 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/Makefile
@@ -7,8 +7,4 @@ a.out.stripped: a.out.dSYM
 	strip -o a.out.stripped a.out
 	ln -sf a.out.dSYM a.out.stripped.dSYM
 
-clean::
-	rm -f a.out.stripped
-	rm -rf $(wildcard *.dSYM)
-
 include Makefile.rules

diff  --git a/lldb/packages/Python/lldbsuite/test/linux/add-symbols/Makefile b/lldb/packages/Python/lldbsuite/test/linux/add-symbols/Makefile
index 98042d61ea56..b10a03899e22 100644
--- a/lldb/packages/Python/lldbsuite/test/linux/add-symbols/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/linux/add-symbols/Makefile
@@ -6,7 +6,4 @@ all: stripped.out
 stripped.out : a.out
 	$(OBJCOPY) --remove-section=.note.gnu.build-id --remove-section=.gnu_debuglink --strip-debug $< $@
 
-clean::
-	$(RM) stripped.out
-
 include Makefile.rules

diff  --git a/lldb/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile b/lldb/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile
index 4f3dd568d5f1..d7a69c78908e 100644
--- a/lldb/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile
@@ -2,7 +2,3 @@ C_SOURCES := a.c b.c
 a.o: CFLAGS_EXTRAS := -gsplit-dwarf
 
 include Makefile.rules
-
-.PHONY: clean
-clean::
-	$(RM) -f a.dwo a.o b.o main

diff  --git a/lldb/packages/Python/lldbsuite/test/linux/sepdebugsymlink/Makefile b/lldb/packages/Python/lldbsuite/test/linux/sepdebugsymlink/Makefile
index a290c8c6f2e8..a1b84c1843e9 100644
--- a/lldb/packages/Python/lldbsuite/test/linux/sepdebugsymlink/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/linux/sepdebugsymlink/Makefile
@@ -13,7 +13,4 @@ dirsymlink: dirreal
 	mkdir $@
 	ln -s ../$</stripped.out $@/stripped.symlink
 
-clean::
-	$(RM) -r dirreal dirsymlink
-
 include Makefile.rules

diff  --git a/lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/Makefile
index 68012d22f5b9..9b1c15bc4230 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/Makefile
@@ -15,6 +15,3 @@ TestApp.app/Contents/MacOS/TestApp: $(SRCDIR)/main.c
 	cp -r $(SRCDIR)/TestApp.app .
 	mv TestApp TestApp.app/Contents/MacOS/TestApp
 	mv TestApp.dSYM TestApp.app.dSYM
-
-clean:
-	rm -rf TestApp.app/Contents/MacOS/TestApp TestApp.app.dSYM

diff  --git a/lldb/packages/Python/lldbsuite/test/macosx/universal/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/universal/Makefile
index efdeb1fd1313..7105181d8c66 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/universal/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/macosx/universal/Makefile
@@ -18,6 +18,3 @@ testit.x86_64h.o: main.c
 
 testit.x86_64.o: main.c
 	$(CC) -g -O0 -arch x86_64 -c -o testit.x86_64.o $<
-
-clean::
-	rm -rf $(wildcard testit* *~)

diff  --git a/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/Makefile
index 33da5d0645ec..65e9dd2fa9e3 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/Makefile
@@ -2,7 +2,3 @@ CXX_SOURCES := main.cpp
 
 include Makefile.rules
 
-# Clean renamed executable on 'make clean'
-clean::
-	$(RM) -f no_synth
-

diff  --git a/lldb/packages/Python/lldbsuite/test/python_api/formatters/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/formatters/Makefile
index 16a823213db6..99998b20bcb0 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/formatters/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/formatters/Makefile
@@ -1,7 +1,3 @@
 CXX_SOURCES := main.cpp
 
 include Makefile.rules
-
-# Clean renamed executable on 'make clean'
-clean::
-	$(RM) -f no_synth

diff  --git a/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/Makefile
index b5256564c2f1..99998b20bcb0 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/Makefile
@@ -1,6 +1,3 @@
 CXX_SOURCES := main.cpp
 
-# Clean renamed executable on 'make clean'
-clean: OBJECTS+=no_synth
-
 include Makefile.rules

diff  --git a/lldb/packages/Python/lldbsuite/test/source-manager/Makefile b/lldb/packages/Python/lldbsuite/test/source-manager/Makefile
index a78dc11e0713..422ecd0c3990 100644
--- a/lldb/packages/Python/lldbsuite/test/source-manager/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/source-manager/Makefile
@@ -5,7 +5,3 @@ include Makefile.rules
 # Copy file into the build folder to enable the test to modify it.
 main-copy.c: main.c
 	cp -f $< $@
-
-
-clean::
-	$(RM) main-copy.c

More information about the lldb-commits mailing list