From 1918cde28e19726d11dcb74764b32ca50385f099 Mon Sep 17 00:00:00 2001
From: Michael Tautschnig <tautschn@amazon.com>
Date: Fri, 5 Jul 2024 18:27:12 +0000
Subject: [PATCH] Regression cleanup: don't repeatedly remove the same file

There is no need to remove `tests.log` as many times as we have
directories.
---
 regression/cbmc-output-file/Makefile     | 2 +-
 regression/contracts/Makefile            | 2 +-
 regression/crangler/Makefile             | 2 +-
 regression/extract_type_header/Makefile  | 2 +-
 regression/goto-cc-cbmc/Makefile         | 2 +-
 regression/goto-cc-file-local/Makefile   | 2 +-
 regression/goto-instrument-chc/Makefile  | 2 +-
 regression/goto-instrument-json/Makefile | 2 +-
 regression/goto-instrument/Makefile      | 2 +-
 regression/goto-interpreter/Makefile     | 2 +-
 regression/goto-synthesizer/Makefile     | 2 +-
 regression/symtab2gb-cbmc/Makefile       | 2 +-
 regression/symtab2gb/Makefile            | 2 +-
 regression/test-script/Makefile          | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/regression/cbmc-output-file/Makefile b/regression/cbmc-output-file/Makefile
index a90c84526a9..f9d7c9b9f32 100644
--- a/regression/cbmc-output-file/Makefile
+++ b/regression/cbmc-output-file/Makefile
@@ -10,8 +10,8 @@ tests.log:
 	@../test.pl -f -e -p -c '../chain.py ../../../src/cbmc/cbmc'
 
 clean:
+	$(RM) tests.log
 	@for dir in *; do \
-		$(RM) tests.log; \
 		if [ -d "$$dir" ]; then \
 			cd "$$dir"; \
 			$(RM) *.out *.gb; \
diff --git a/regression/contracts/Makefile b/regression/contracts/Makefile
index a1700f3d9ab..636f541c724 100644
--- a/regression/contracts/Makefile
+++ b/regression/contracts/Makefile
@@ -32,8 +32,8 @@ tests.log: ../test.pl test
 
 
 clean:
+	$(RM) tests.log
 	@for dir in *; do \
-		$(RM) tests.log; \
 		if [ -d "$$dir" ]; then \
 			cd "$$dir"; \
 			$(RM) *.out *.gb *.smt2; \
diff --git a/regression/crangler/Makefile b/regression/crangler/Makefile
index b07a6826202..2b90a3a28eb 100644
--- a/regression/crangler/Makefile
+++ b/regression/crangler/Makefile
@@ -17,8 +17,8 @@ tests.log:
 endif
 
 clean:
+	$(RM) tests.log
 	@for dir in *; do \
-		$(RM) tests.log; \
 		if [ -d "$$dir" ]; then \
 			cd "$$dir"; \
 			$(RM) *.out *.gb; \
diff --git a/regression/extract_type_header/Makefile b/regression/extract_type_header/Makefile
index e1d80b9ed93..fa274cfa7b9 100644
--- a/regression/extract_type_header/Makefile
+++ b/regression/extract_type_header/Makefile
@@ -18,8 +18,8 @@ tests.log:
 	@../test.pl -e -p -c '../chain.sh $(exe) ../../../src/goto-instrument/goto-instrument ../../../src/cbmc/cbmc ./../../../scripts/extract_type_header.py $(is_windows)'
 
 clean:
+	$(RM) tests.log
 	@for dir in *; do \
-		$(RM) tests.log; \
 		if [ -d "$$dir" ]; then \
 			cd "$$dir"; \
 			$(RM) *.out *.gb; \
diff --git a/regression/goto-cc-cbmc/Makefile b/regression/goto-cc-cbmc/Makefile
index 2d13e8066e1..10734a47ff2 100644
--- a/regression/goto-cc-cbmc/Makefile
+++ b/regression/goto-cc-cbmc/Makefile
@@ -18,8 +18,8 @@ tests.log:
 	@../test.pl -e -p -c '../chain.sh $(exe) ../../../src/cbmc/cbmc $(is_windows)'
 
 clean:
+	$(RM) tests.log
 	@for dir in *; do \
-		$(RM) tests.log; \
 		if [ -d "$$dir" ]; then \
 			cd "$$dir"; \
 			$(RM) *.out *.gb; \
diff --git a/regression/goto-cc-file-local/Makefile b/regression/goto-cc-file-local/Makefile
index 26ca0a7c48b..079953a40b5 100644
--- a/regression/goto-cc-file-local/Makefile
+++ b/regression/goto-cc-file-local/Makefile
@@ -18,8 +18,8 @@ tests.log:
 	@../test.pl -e -p -c '../chain.sh $(exe) ../../../src/goto-instrument/goto-instrument ../../../src/cbmc/cbmc $(is_windows)'
 
 clean:
+	$(RM) tests.log
 	@for dir in *; do \
-		$(RM) tests.log; \
 		if [ -d "$$dir" ]; then \
 			cd "$$dir"; \
 			$(RM) *.out *.gb; \
diff --git a/regression/goto-instrument-chc/Makefile b/regression/goto-instrument-chc/Makefile
index 084f6ebc736..99e207a359a 100644
--- a/regression/goto-instrument-chc/Makefile
+++ b/regression/goto-instrument-chc/Makefile
@@ -18,8 +18,8 @@ tests.log:
 	@../test.pl -e -p -c '../chain.sh $(exe) ../../../src/goto-instrument/goto-instrument'
 
 clean:
+	$(RM) tests.log
 	@for dir in *; do \
-		$(RM) tests.log; \
 		if [ -d "$$dir" ]; then \
 			cd "$$dir"; \
 			$(RM) *.out *.gb; \
diff --git a/regression/goto-instrument-json/Makefile b/regression/goto-instrument-json/Makefile
index 5ce76853266..2d46856a641 100644
--- a/regression/goto-instrument-json/Makefile
+++ b/regression/goto-instrument-json/Makefile
@@ -10,8 +10,8 @@ tests.log:
 	@../test.pl -e -p -c '../chain.sh $(exe) ../../../src/symtab2gb/symtab2gb ../../../src/goto-instrument/goto-instrument'
 
 clean:
+	$(RM) tests.log
 	@for dir in *; do \
-		$(RM) tests.log; \
 		if [ -d "$$dir" ]; then \
 			cd "$$dir"; \
 			$(RM) *.out *.gb; \
diff --git a/regression/goto-instrument/Makefile b/regression/goto-instrument/Makefile
index ea28defcf7b..6712245e332 100644
--- a/regression/goto-instrument/Makefile
+++ b/regression/goto-instrument/Makefile
@@ -18,8 +18,8 @@ tests.log:
 	@../test.pl -e -p -c '../chain.sh $(exe) ../../../src/goto-instrument/goto-instrument ../../../src/cbmc/cbmc $(is_windows)'
 
 clean:
+	$(RM) tests.log
 	@for dir in *; do \
-		$(RM) tests.log; \
 		if [ -d "$$dir" ]; then \
 			cd "$$dir"; \
 			$(RM) *.out *.gb; \
diff --git a/regression/goto-interpreter/Makefile b/regression/goto-interpreter/Makefile
index 19f48137920..4eaecd1e421 100644
--- a/regression/goto-interpreter/Makefile
+++ b/regression/goto-interpreter/Makefile
@@ -18,8 +18,8 @@ tests.log:
 	@../test.pl -e -p -c '../chain.sh $(exe) ../../../src/goto-instrument/goto-instrument $(is_windows)'
 
 clean:
+	$(RM) tests.log
 	@for dir in *; do \
-		$(RM) tests.log; \
 		if [ -d "$$dir" ]; then \
 			cd "$$dir"; \
 			$(RM) *.out *.gb; \
diff --git a/regression/goto-synthesizer/Makefile b/regression/goto-synthesizer/Makefile
index 68f8d95d5c8..2d598da0990 100644
--- a/regression/goto-synthesizer/Makefile
+++ b/regression/goto-synthesizer/Makefile
@@ -32,8 +32,8 @@ tests.log: ../test.pl test
 
 
 clean:
+	$(RM) tests.log
 	@for dir in *; do \
-		$(RM) tests.log; \
 		if [ -d "$$dir" ]; then \
 			cd "$$dir"; \
 			$(RM) *.out *.gb *.smt2; \
diff --git a/regression/symtab2gb-cbmc/Makefile b/regression/symtab2gb-cbmc/Makefile
index 32a16d37382..6e075833eaf 100644
--- a/regression/symtab2gb-cbmc/Makefile
+++ b/regression/symtab2gb-cbmc/Makefile
@@ -10,8 +10,8 @@ tests.log:
 	@../test.pl -e -p -c '../chain.sh $(exe) ../../../src/symtab2gb/symtab2gb ../../../src/cbmc/cbmc'
 
 clean:
+	$(RM) tests.log
 	@for dir in *; do \
-		$(RM) tests.log; \
 		if [ -d "$$dir" ]; then \
 			cd "$$dir"; \
 			$(RM) *.out *.gb; \
diff --git a/regression/symtab2gb/Makefile b/regression/symtab2gb/Makefile
index 32a16d37382..6e075833eaf 100644
--- a/regression/symtab2gb/Makefile
+++ b/regression/symtab2gb/Makefile
@@ -10,8 +10,8 @@ tests.log:
 	@../test.pl -e -p -c '../chain.sh $(exe) ../../../src/symtab2gb/symtab2gb ../../../src/cbmc/cbmc'
 
 clean:
+	$(RM) tests.log
 	@for dir in *; do \
-		$(RM) tests.log; \
 		if [ -d "$$dir" ]; then \
 			cd "$$dir"; \
 			$(RM) *.out *.gb; \
diff --git a/regression/test-script/Makefile b/regression/test-script/Makefile
index cc3a746371f..4560cc2a38b 100644
--- a/regression/test-script/Makefile
+++ b/regression/test-script/Makefile
@@ -17,8 +17,8 @@ tests.log:
 	@../test.pl -e -p -c ../program_runner.sh -K
 
 clean:
+	$(RM) tests.log
 	@for dir in *; do \
-		$(RM) tests.log; \
 		if [ -d "$$dir" ]; then \
 			cd "$$dir"; \
 			$(RM) *.out *.gb; \