From e75f995b55b0a4ea34abef9334ee831c875a0fe6 Mon Sep 17 00:00:00 2001
From: Michael Tautschnig <tautschn@amazon.com>
Date: Fri, 7 Jul 2023 19:22:44 +0000
Subject: [PATCH] Add missing cleanup

make clean did not actually remove all files.
---
 regression/Makefile                 | 6 ++----
 regression/ansi-c/Makefile          | 2 +-
 regression/catch-framework/Makefile | 1 +
 regression/cbmc-primitives/Makefile | 2 +-
 regression/contracts-dfcc/Makefile  | 2 +-
 regression/cprover/Makefile         | 1 +
 regression/goto-harness/Makefile    | 1 +
 regression/goto-instrument/Makefile | 1 +
 regression/solver-hardness/Makefile | 1 +
 9 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/regression/Makefile b/regression/Makefile
index 90bf75602d42..daee836f5055 100644
--- a/regression/Makefile
+++ b/regression/Makefile
@@ -114,9 +114,7 @@ test-parallel:
 
 .PHONY: clean
 clean:
-	@for dir in *; do \
-		if [ -d "$$dir" ]; then \
-			$(MAKE) -C "$$dir" clean; \
-		fi; \
+	@for dir in $(DIRS); do \
+		$(MAKE) -C "$$dir" clean; \
 	done;
 	$(RM) tests.log
diff --git a/regression/ansi-c/Makefile b/regression/ansi-c/Makefile
index c33acea9afbb..ba16308dca63 100644
--- a/regression/ansi-c/Makefile
+++ b/regression/ansi-c/Makefile
@@ -64,4 +64,4 @@ build_goto_binaries:
 clean:
 	find . -name '*.out' -execdir $(RM) '{}' \;
 	find . -name '*.gb' -execdir $(RM) '{}' \;
-	$(RM) tests.log tests-c++-front-end.log
+	$(RM) tests*.log
diff --git a/regression/catch-framework/Makefile b/regression/catch-framework/Makefile
index 8b4ad5cfda45..01c98b1bf97e 100644
--- a/regression/catch-framework/Makefile
+++ b/regression/catch-framework/Makefile
@@ -6,4 +6,5 @@ test:
 tests.log: ../test.pl test
 
 clean:
+	find . -name '*.out' -execdir $(RM) '{}' \;
 	$(RM) tests*.log
diff --git a/regression/cbmc-primitives/Makefile b/regression/cbmc-primitives/Makefile
index 64e9659281e3..1c5578af5708 100644
--- a/regression/cbmc-primitives/Makefile
+++ b/regression/cbmc-primitives/Makefile
@@ -11,4 +11,4 @@ tests.log: ../test.pl
 
 clean:
 	find . -name '*.out' -execdir $(RM) '{}' \;
-	$(RM) tests.log
+	$(RM) tests*.log
diff --git a/regression/contracts-dfcc/Makefile b/regression/contracts-dfcc/Makefile
index d31f978d48b9..9dac0ee2d794 100644
--- a/regression/contracts-dfcc/Makefile
+++ b/regression/contracts-dfcc/Makefile
@@ -34,10 +34,10 @@ tests.log: ../test.pl test
 
 clean:
 	@for dir in *; do \
-		$(RM) tests.log; \
 		if [ -d "$$dir" ]; then \
 			cd "$$dir"; \
 			$(RM) *.out *.gb *.smt2; \
 			cd ..; \
 		fi \
 	done
+	$(RM) tests*.log
diff --git a/regression/cprover/Makefile b/regression/cprover/Makefile
index 7ba46755339d..0e7c3786a40a 100644
--- a/regression/cprover/Makefile
+++ b/regression/cprover/Makefile
@@ -10,4 +10,5 @@ test-no-p:
 	@../test.pl -e -c '../../../src/cprover/cprover'
 
 clean:
+	find . -name '*.out' -execdir $(RM) '{}' \;
 	$(RM) tests.log
diff --git a/regression/goto-harness/Makefile b/regression/goto-harness/Makefile
index 71166794d864..3a1d2fb59377 100644
--- a/regression/goto-harness/Makefile
+++ b/regression/goto-harness/Makefile
@@ -23,4 +23,5 @@ tests.log: ../test.pl
 clean:
 	find . -name '*.out' -execdir $(RM) '{}' \;
 	find . -name '*.gb' -execdir $(RM) {} \;
+	find . -name '*-harness.c' -execdir $(RM) {} \;
 	$(RM) tests.log
diff --git a/regression/goto-instrument/Makefile b/regression/goto-instrument/Makefile
index 26ca0a7c48b5..ea28defcf7ba 100644
--- a/regression/goto-instrument/Makefile
+++ b/regression/goto-instrument/Makefile
@@ -26,3 +26,4 @@ clean:
 			cd ..; \
 		fi \
 	done
+	$(RM) ../cbmc/Recursion6/*.gb
diff --git a/regression/solver-hardness/Makefile b/regression/solver-hardness/Makefile
index a290f5841bfa..d7c7e123a7dc 100644
--- a/regression/solver-hardness/Makefile
+++ b/regression/solver-hardness/Makefile
@@ -16,4 +16,5 @@ tests.log: ../test.pl test
 
 clean:
 	find . -name '*.out' -execdir $(RM) '{}' \;
+	find . -name '*.json' -execdir $(RM) '{}' \;
 	$(RM) tests.log