Merge pull request #5943 from TGWDB/regression-makefile-cleanup

NlightNFotis · web-flow · commit 30648555753e · 2021-03-16T19:54:05.000Z
Ensure make clean of regression tests cleans everything
diff --git a/regression/Makefile b/regression/Makefile
@@ -95,3 +95,4 @@ clean:
 			$(MAKE) -C "$$dir" clean; \
 		fi; \
 	done;
+	$(RM) tests.log
diff --git a/regression/acceleration/Makefile b/regression/acceleration/Makefile
@@ -29,4 +29,5 @@ show:
 
 clean:
 	$(RM) tests.log
-	$(RM) */main.out
+	find . -name '*.gb' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
diff --git a/regression/ansi-c/Makefile b/regression/ansi-c/Makefile
@@ -43,6 +43,6 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.gb' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
 	$(RM) tests.log tests-c++-front-end.log
diff --git a/regression/array-refinement-with-incr/Makefile b/regression/array-refinement-with-incr/Makefile
@@ -16,6 +16,6 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.gb' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
 	$(RM) tests.log
diff --git a/regression/array-refinement/Makefile b/regression/array-refinement/Makefile
@@ -16,6 +16,6 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.gb' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
 	$(RM) tests.log
diff --git a/regression/cbmc-concurrency/Makefile b/regression/cbmc-concurrency/Makefile
@@ -23,6 +23,6 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.gb' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
 	$(RM) tests.log
diff --git a/regression/cbmc-cover/Makefile b/regression/cbmc-cover/Makefile
@@ -14,6 +14,6 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.gb' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
 	$(RM) tests.log
diff --git a/regression/cbmc-cpp/Makefile b/regression/cbmc-cpp/Makefile
@@ -31,6 +31,6 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.gb' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
 	$(RM) tests.log
diff --git a/regression/cbmc-library/Makefile b/regression/cbmc-library/Makefile
@@ -21,5 +21,5 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
 	$(RM) tests.log
diff --git a/regression/cbmc-primitives/Makefile b/regression/cbmc-primitives/Makefile
@@ -14,5 +14,5 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
 	$(RM) tests.log
diff --git a/regression/cbmc-sequentialization/Makefile b/regression/cbmc-sequentialization/Makefile
@@ -22,6 +22,6 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.smt2' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.smt2' -execdir $(RM) '{}' \;
 	$(RM) tests.log
diff --git a/regression/cbmc/Makefile b/regression/cbmc/Makefile
@@ -28,6 +28,6 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.smt2' -execdir $(RM) '{}' \;
-	$(RM) tests.log
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.smt2' -execdir $(RM) '{}' \;
+	$(RM) tests.log tests-paths-lifo.log tests-cprover-smt2.log
diff --git a/regression/cpp-from-CVS/Makefile b/regression/cpp-from-CVS/Makefile
@@ -14,6 +14,6 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.gb' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
 	$(RM) tests.log
diff --git a/regression/cpp-linter/Makefile b/regression/cpp-linter/Makefile
@@ -14,6 +14,6 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.gb' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
 	$(RM) tests.log
diff --git a/regression/cpp/Makefile b/regression/cpp/Makefile
@@ -36,6 +36,6 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.gb' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
 	$(RM) tests.log
diff --git a/regression/fault-localization/Makefile b/regression/fault-localization/Makefile
@@ -14,6 +14,6 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.gb' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
 	$(RM) tests.log
diff --git a/regression/goto-analyzer-simplify/Makefile b/regression/goto-analyzer-simplify/Makefile
@@ -21,11 +21,6 @@ show:
 	done;
 
 clean:
-	@for dir in *; do \
-		rm -f tests.log; \
-		if [ -d "$$dir" ]; then \
-			cd "$$dir"; \
-			rm -f *.out *.gb; \
-			cd ..; \
-		fi \
-	done
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
+	$(RM) tests.log
diff --git a/regression/goto-analyzer-taint/Makefile b/regression/goto-analyzer-taint/Makefile
@@ -14,6 +14,6 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.gb' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
 	$(RM) tests.log
diff --git a/regression/goto-analyzer/Makefile b/regression/goto-analyzer/Makefile
@@ -14,6 +14,6 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.gb' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
 	$(RM) tests.log
diff --git a/regression/goto-cc-goto-analyzer/Makefile b/regression/goto-cc-goto-analyzer/Makefile
@@ -26,11 +26,6 @@ show:
 	done;
 
 clean:
-	@for dir in *; do \
-		rm -f tests.log; \
-		if [ -d "$$dir" ]; then \
-			cd "$$dir"; \
-			rm -f *.out *.gb; \
-			cd ..; \
-		fi \
-	done
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
+	$(RM) tests.log
diff --git a/regression/goto-cc-multi-file/Makefile b/regression/goto-cc-multi-file/Makefile
@@ -26,11 +26,6 @@ show:
 	done;
 
 clean:
-	@for dir in *; do \
-		rm -f tests.log; \
-		if [ -d "$$dir" ]; then \
-			cd "$$dir"; \
-			rm -f *.out *.gb; \
-			cd ..; \
-		fi \
-	done
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
+	$(RM) tests.log
diff --git a/regression/goto-cc-regression-gh-issue-5380/Makefile b/regression/goto-cc-regression-gh-issue-5380/Makefile
@@ -25,11 +25,6 @@ show:
 	done;
 
 clean:
-	@for dir in *; do
-		$(RM) tests.log; \
-		if [ -d "$$dir" ]; then \
-			cd "$$dir"; \
-			$(RM) *.out *.gb; \
-			cd ..; \
-		fi; \
-	done;
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
+	$(RM) tests.log
diff --git a/regression/goto-cl/Makefile b/regression/goto-cl/Makefile
@@ -31,9 +31,9 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.gb' -execdir $(RM) '{}' \;
-	find -name '*.obj' -execdir $(RM) '{}' \;
-	find -name '*.exe' -execdir $(RM) '{}' \;
-	find -name '*.goto-cc-saved' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
+	find . -name '*.obj' -execdir $(RM) '{}' \;
+	find . -name '*.exe' -execdir $(RM) '{}' \;
+	find . -name '*.goto-cc-saved' -execdir $(RM) '{}' \;
 	$(RM) tests.log
diff --git a/regression/goto-diff/Makefile b/regression/goto-diff/Makefile
@@ -14,5 +14,5 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
 	$(RM) tests.log
diff --git a/regression/goto-gcc/Makefile b/regression/goto-gcc/Makefile
@@ -36,7 +36,7 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.gb' -execdir $(RM) '{}' \;
-	find -name '*.goto-cc-saved' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
+	find . -name '*.goto-cc-saved' -execdir $(RM) '{}' \;
 	$(RM) tests.log archives/libour_archive.a archives/foo.o
diff --git a/regression/goto-harness-multi-file-project/Makefile b/regression/goto-harness-multi-file-project/Makefile
@@ -21,5 +21,5 @@ tests.log: ../test.pl
 	@../test.pl -e -p -c "../chain.sh $(GOTO_CC_EXE) $(GOTO_HARNESS_EXE) $(CBMC_EXE) $(is_windows)"
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
 	$(RM) tests.log
diff --git a/regression/goto-harness/Makefile b/regression/goto-harness/Makefile
@@ -28,6 +28,6 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.gb' -execdir $(RM) {} \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) {} \;
 	$(RM) tests.log
diff --git a/regression/goto-instrument-typedef/Makefile b/regression/goto-instrument-typedef/Makefile
@@ -25,11 +25,6 @@ show:
 	done;
 
 clean:
-	@for dir in *; do \
-		rm -f tests.log; \
-		if [ -d "$$dir" ]; then \
-			cd "$$dir"; \
-			rm -f *.out *.gb; \
-			cd ..; \
-		fi \
-	done
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
+	$(RM) tests.log
diff --git a/regression/goto-ld/Makefile b/regression/goto-ld/Makefile
@@ -27,6 +27,7 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.gb' -execdir $(RM) '{}' \;
-	find -name '*.goto-cc-saved' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
+	find . -name '*.goto-cc-saved' -execdir $(RM) '{}' \;
+	$(RM) tests.log
diff --git a/regression/invariants/Makefile b/regression/invariants/Makefile
@@ -27,6 +27,6 @@ driver$(EXEEXT): $(OBJ)
 	$(LINKBIN)
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
 	$(RM) driver$(EXEEXT) driver$(DEPEXT) driver$(OBJEXT)
 	$(RM) tests.log
diff --git a/regression/k-induction/Makefile b/regression/k-induction/Makefile
@@ -14,6 +14,6 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.gb' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
 	$(RM) tests.log
diff --git a/regression/linking-goto-binaries/Makefile b/regression/linking-goto-binaries/Makefile
@@ -28,6 +28,6 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.gb' -execdir $(RM) {} \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) {} \;
 	$(RM) tests.log
diff --git a/regression/memory-analyzer/Makefile b/regression/memory-analyzer/Makefile
@@ -4,9 +4,9 @@ GOTO_GCC_EXE=../../../src/goto-cc/goto-gcc
 MEMORY_ANALYZER_EXE=../../../src/memory-analyzer/memory-analyzer
 
 clean:
-	find -name '*.gb' -execdir $(RM) '{}' \;
-	find -name '*.exe' -execdir $(RM) '{}' \;
-	find -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
+	find . -name '*.exe' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
 	$(RM) tests.log
 
 test:
diff --git a/regression/smt2_solver/Makefile b/regression/smt2_solver/Makefile
@@ -14,5 +14,5 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
 	$(RM) tests.log
diff --git a/regression/smt2_strings/Makefile b/regression/smt2_strings/Makefile
@@ -14,5 +14,5 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
 	$(RM) tests.log
diff --git a/regression/snapshot-harness/Makefile b/regression/snapshot-harness/Makefile
@@ -20,7 +20,7 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.gb' -execdir $(RM) '{}' \;
-	find -name '*.json' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
+	find . -name '*.json' -execdir $(RM) '{}' \;
 	$(RM) tests.log
diff --git a/regression/solver-hardness/Makefile b/regression/solver-hardness/Makefile
@@ -22,5 +22,5 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
 	$(RM) tests.log
diff --git a/regression/statement-list/Makefile b/regression/statement-list/Makefile
@@ -13,6 +13,6 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.smt2' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.smt2' -execdir $(RM) '{}' \;
 	$(RM) tests.log
diff --git a/regression/strings/Makefile b/regression/strings/Makefile
@@ -20,7 +20,7 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.gb' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
 	$(RM) tests.log
 
diff --git a/regression/systemc/Makefile b/regression/systemc/Makefile
@@ -39,6 +39,6 @@ show:
 	done;
 
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.gb' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
 	$(RM) tests.log
diff --git a/regression/validate-trace-xml-schema/Makefile b/regression/validate-trace-xml-schema/Makefile
@@ -2,7 +2,7 @@
 test:
 	sh check.sh
 clean:
-	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.gb' -execdir $(RM) '{}' \;
+	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.gb' -execdir $(RM) '{}' \;
 	$(RM) tests.log
 
