Merge pull request #8369 from tautschnig/fix-cleanup

kroening · web-flow · commit b3f1e7138225 · 2024-07-10T09:14:09.000-07:00
Regression cleanup: don't repeatedly remove the same file
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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; \
