Skip to content

Commit d5bf136

Browse files
TGWDBTGWDB
committed
Ensure make clean of regression tests cleans everything
This commit fixes many make files to ensure they properly find and clean up the files created by the running of regression tests. This also fixes a bug with the use of the find command without a specified path. Fixes: #5910
1 parent b7859de commit d5bf136

File tree

41 files changed

+88
-110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+88
-110
lines changed

‎regression/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,4 @@ clean:
9595
$(MAKE) -C "$$dir" clean; \
9696
fi; \
9797
done;
98+
$(RM) tests.log

‎regression/acceleration/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,6 @@ show:
2828
done;
2929

3030
clean:
31-
$(RM) tests.log
32-
$(RM) */main.out
31+
find . -name '*.log' -execdir $(RM) '{}' \;
32+
find . -name '*.gb' -execdir $(RM) '{}' \;
33+
find . -name '*.out' -execdir $(RM) '{}' \;

‎regression/ansi-c/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ show:
4343
done;
4444

4545
clean:
46-
find -name '*.out' -execdir $(RM) '{}' \;
47-
find -name '*.gb' -execdir $(RM) '{}' \;
46+
find . -name '*.out' -execdir $(RM) '{}' \;
47+
find . -name '*.gb' -execdir $(RM) '{}' \;
4848
$(RM) tests.log tests-c++-front-end.log

‎regression/array-refinement-with-incr/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ show:
1616
done;
1717

1818
clean:
19-
find -name '*.out' -execdir $(RM) '{}' \;
20-
find -name '*.gb' -execdir $(RM) '{}' \;
19+
find . -name '*.out' -execdir $(RM) '{}' \;
20+
find . -name '*.gb' -execdir $(RM) '{}' \;
2121
$(RM) tests.log

‎regression/array-refinement/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ show:
1616
done;
1717

1818
clean:
19-
find -name '*.out' -execdir $(RM) '{}' \;
20-
find -name '*.gb' -execdir $(RM) '{}' \;
19+
find . -name '*.out' -execdir $(RM) '{}' \;
20+
find . -name '*.gb' -execdir $(RM) '{}' \;
2121
$(RM) tests.log

‎regression/cbmc-concurrency/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ show:
2323
done;
2424

2525
clean:
26-
find -name '*.out' -execdir $(RM) '{}' \;
27-
find -name '*.gb' -execdir $(RM) '{}' \;
26+
find . -name '*.out' -execdir $(RM) '{}' \;
27+
find . -name '*.gb' -execdir $(RM) '{}' \;
2828
$(RM) tests.log

‎regression/cbmc-cover/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ show:
1414
done;
1515

1616
clean:
17-
find -name '*.out' -execdir $(RM) '{}' \;
18-
find -name '*.gb' -execdir $(RM) '{}' \;
17+
find . -name '*.out' -execdir $(RM) '{}' \;
18+
find . -name '*.gb' -execdir $(RM) '{}' \;
1919
$(RM) tests.log

‎regression/cbmc-cpp/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ show:
3131
done;
3232

3333
clean:
34-
find -name '*.out' -execdir $(RM) '{}' \;
35-
find -name '*.gb' -execdir $(RM) '{}' \;
34+
find . -name '*.out' -execdir $(RM) '{}' \;
35+
find . -name '*.gb' -execdir $(RM) '{}' \;
3636
$(RM) tests.log

‎regression/cbmc-library/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ show:
2121
done;
2222

2323
clean:
24-
find -name '*.out' -execdir $(RM) '{}' \;
24+
find . -name '*.out' -execdir $(RM) '{}' \;
2525
$(RM) tests.log

‎regression/cbmc-primitives/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ show:
1414
done;
1515

1616
clean:
17-
find -name '*.out' -execdir $(RM) '{}' \;
17+
find . -name '*.out' -execdir $(RM) '{}' \;
1818
$(RM) tests.log

‎regression/cbmc-sequentialization/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ show:
2222
done;
2323

2424
clean:
25-
find -name '*.out' -execdir $(RM) '{}' \;
26-
find -name '*.smt2' -execdir $(RM) '{}' \;
25+
find . -name '*.out' -execdir $(RM) '{}' \;
26+
find . -name '*.smt2' -execdir $(RM) '{}' \;
2727
$(RM) tests.log

‎regression/cbmc/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ show:
2828
done;
2929

3030
clean:
31-
find -name '*.out' -execdir $(RM) '{}' \;
32-
find -name '*.smt2' -execdir $(RM) '{}' \;
33-
$(RM) tests.log
31+
find . -name '*.out' -execdir $(RM) '{}' \;
32+
find . -name '*.smt2' -execdir $(RM) '{}' \;
33+
find . -name '*.log' -execdir $(RM) '{}' \;

‎regression/cpp-from-CVS/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ show:
1414
done;
1515

1616
clean:
17-
find -name '*.out' -execdir $(RM) '{}' \;
18-
find -name '*.gb' -execdir $(RM) '{}' \;
17+
find . -name '*.out' -execdir $(RM) '{}' \;
18+
find . -name '*.gb' -execdir $(RM) '{}' \;
1919
$(RM) tests.log

‎regression/cpp-linter/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ show:
1414
done;
1515

1616
clean:
17-
find -name '*.out' -execdir $(RM) '{}' \;
18-
find -name '*.gb' -execdir $(RM) '{}' \;
17+
find . -name '*.out' -execdir $(RM) '{}' \;
18+
find . -name '*.gb' -execdir $(RM) '{}' \;
1919
$(RM) tests.log

‎regression/cpp/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ show:
3636
done;
3737

3838
clean:
39-
find -name '*.out' -execdir $(RM) '{}' \;
40-
find -name '*.gb' -execdir $(RM) '{}' \;
39+
find . -name '*.out' -execdir $(RM) '{}' \;
40+
find . -name '*.gb' -execdir $(RM) '{}' \;
4141
$(RM) tests.log

‎regression/fault-localization/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ show:
1414
done;
1515

1616
clean:
17-
find -name '*.out' -execdir $(RM) '{}' \;
18-
find -name '*.gb' -execdir $(RM) '{}' \;
17+
find . -name '*.out' -execdir $(RM) '{}' \;
18+
find . -name '*.gb' -execdir $(RM) '{}' \;
1919
$(RM) tests.log

‎regression/goto-analyzer-simplify/Makefile

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ show:
2121
done;
2222

2323
clean:
24-
@for dir in *; do \
25-
rm -f tests.log; \
26-
if [ -d "$$dir" ]; then \
27-
cd "$$dir"; \
28-
rm -f *.out *.gb; \
29-
cd ..; \
30-
fi \
31-
done
24+
find . -name '*.out' -execdir $(RM) '{}' \;
25+
find . -name '*.gb' -execdir $(RM) '{}' \;
26+
find . -name '*.log' -execdir $(RM) '{}' \;

‎regression/goto-analyzer-taint/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ show:
1414
done;
1515

1616
clean:
17-
find -name '*.out' -execdir $(RM) '{}' \;
18-
find -name '*.gb' -execdir $(RM) '{}' \;
17+
find . -name '*.out' -execdir $(RM) '{}' \;
18+
find . -name '*.gb' -execdir $(RM) '{}' \;
1919
$(RM) tests.log

‎regression/goto-analyzer/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ show:
1414
done;
1515

1616
clean:
17-
find -name '*.out' -execdir $(RM) '{}' \;
18-
find -name '*.gb' -execdir $(RM) '{}' \;
17+
find . -name '*.out' -execdir $(RM) '{}' \;
18+
find . -name '*.gb' -execdir $(RM) '{}' \;
1919
$(RM) tests.log

‎regression/goto-cc-goto-analyzer/Makefile

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ show:
2626
done;
2727

2828
clean:
29-
@for dir in *; do \
30-
rm -f tests.log; \
31-
if [ -d "$$dir" ]; then \
32-
cd "$$dir"; \
33-
rm -f *.out *.gb; \
34-
cd ..; \
35-
fi \
36-
done
29+
find . -name '*.out' -execdir $(RM) '{}' \;
30+
find . -name '*.gb' -execdir $(RM) '{}' \;
31+
find . -name '*.log' -execdir $(RM) '{}' \;

‎regression/goto-cc-multi-file/Makefile

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ show:
2626
done;
2727

2828
clean:
29-
@for dir in *; do \
30-
rm -f tests.log; \
31-
if [ -d "$$dir" ]; then \
32-
cd "$$dir"; \
33-
rm -f *.out *.gb; \
34-
cd ..; \
35-
fi \
36-
done
29+
find . -name '*.out' -execdir $(RM) '{}' \;
30+
find . -name '*.gb' -execdir $(RM) '{}' \;
31+
find . -name '*.log' -execdir $(RM) '{}' \;

‎regression/goto-cc-regression-gh-issue-5380/Makefile

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ show:
2525
done;
2626

2727
clean:
28-
@for dir in *; do
29-
$(RM) tests.log; \
30-
if [ -d "$$dir" ]; then \
31-
cd "$$dir"; \
32-
$(RM) *.out *.gb; \
33-
cd ..; \
34-
fi; \
35-
done;
28+
find . -name '*.out' -execdir $(RM) '{}' \;
29+
find . -name '*.gb' -execdir $(RM) '{}' \;
30+
find . -name '*.log' -execdir $(RM) '{}' \;

‎regression/goto-cl/Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ show:
3131
done;
3232

3333
clean:
34-
find -name '*.out' -execdir $(RM) '{}' \;
35-
find -name '*.gb' -execdir $(RM) '{}' \;
36-
find -name '*.obj' -execdir $(RM) '{}' \;
37-
find -name '*.exe' -execdir $(RM) '{}' \;
38-
find -name '*.goto-cc-saved' -execdir $(RM) '{}' \;
34+
find . -name '*.out' -execdir $(RM) '{}' \;
35+
find . -name '*.gb' -execdir $(RM) '{}' \;
36+
find . -name '*.obj' -execdir $(RM) '{}' \;
37+
find . -name '*.exe' -execdir $(RM) '{}' \;
38+
find . -name '*.goto-cc-saved' -execdir $(RM) '{}' \;
3939
$(RM) tests.log

‎regression/goto-diff/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ show:
1414
done;
1515

1616
clean:
17-
find -name '*.out' -execdir $(RM) '{}' \;
17+
find . -name '*.out' -execdir $(RM) '{}' \;
1818
$(RM) tests.log

‎regression/goto-gcc/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ show:
3636
done;
3737

3838
clean:
39-
find -name '*.out' -execdir $(RM) '{}' \;
40-
find -name '*.gb' -execdir $(RM) '{}' \;
41-
find -name '*.goto-cc-saved' -execdir $(RM) '{}' \;
39+
find . -name '*.out' -execdir $(RM) '{}' \;
40+
find . -name '*.gb' -execdir $(RM) '{}' \;
41+
find . -name '*.goto-cc-saved' -execdir $(RM) '{}' \;
4242
$(RM) tests.log archives/libour_archive.a archives/foo.o

‎regression/goto-harness-multi-file-project/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ tests.log: ../test.pl
2121
@../test.pl -e -p -c "../chain.sh $(GOTO_CC_EXE) $(GOTO_HARNESS_EXE) $(CBMC_EXE) $(is_windows)"
2222

2323
clean:
24-
find -name '*.out' -execdir $(RM) '{}' \;
24+
find . -name '*.out' -execdir $(RM) '{}' \;
2525
$(RM) tests.log

‎regression/goto-harness/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ show:
2828
done;
2929

3030
clean:
31-
find -name '*.out' -execdir $(RM) '{}' \;
32-
find -name '*.gb' -execdir $(RM) {} \;
31+
find . -name '*.out' -execdir $(RM) '{}' \;
32+
find . -name '*.gb' -execdir $(RM) {} \;
3333
$(RM) tests.log

‎regression/goto-instrument-typedef/Makefile

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ show:
2525
done;
2626

2727
clean:
28-
@for dir in *; do \
29-
rm -f tests.log; \
30-
if [ -d "$$dir" ]; then \
31-
cd "$$dir"; \
32-
rm -f *.out *.gb; \
33-
cd ..; \
34-
fi \
35-
done
28+
find . -name '*.out' -execdir $(RM) '{}' \;
29+
find . -name '*.gb' -execdir $(RM) '{}' \;
30+
find . -name '*.log' -execdir $(RM) '{}' \;

‎regression/goto-ld/Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ show:
2727
done;
2828

2929
clean:
30-
find -name '*.out' -execdir $(RM) '{}' \;
31-
find -name '*.gb' -execdir $(RM) '{}' \;
32-
find -name '*.goto-cc-saved' -execdir $(RM) '{}' \;
30+
find . -name '*.out' -execdir $(RM) '{}' \;
31+
find . -name '*.gb' -execdir $(RM) '{}' \;
32+
find . -name '*.goto-cc-saved' -execdir $(RM) '{}' \;
33+
find . -name '*.log' -execdir $(RM) '{}' \;

‎regression/invariants/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ driver$(EXEEXT): $(OBJ)
2727
$(LINKBIN)
2828

2929
clean:
30-
find -name '*.out' -execdir $(RM) '{}' \;
30+
find . -name '*.out' -execdir $(RM) '{}' \;
3131
$(RM) driver$(EXEEXT) driver$(DEPEXT) driver$(OBJEXT)
3232
$(RM) tests.log

‎regression/k-induction/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ show:
1414
done;
1515

1616
clean:
17-
find -name '*.out' -execdir $(RM) '{}' \;
18-
find -name '*.gb' -execdir $(RM) '{}' \;
17+
find . -name '*.out' -execdir $(RM) '{}' \;
18+
find . -name '*.gb' -execdir $(RM) '{}' \;
1919
$(RM) tests.log

‎regression/linking-goto-binaries/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ show:
2828
done;
2929

3030
clean:
31-
find -name '*.out' -execdir $(RM) '{}' \;
32-
find -name '*.gb' -execdir $(RM) {} \;
31+
find . -name '*.out' -execdir $(RM) '{}' \;
32+
find . -name '*.gb' -execdir $(RM) {} \;
3333
$(RM) tests.log

‎regression/memory-analyzer/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ GOTO_GCC_EXE=../../../src/goto-cc/goto-gcc
44
MEMORY_ANALYZER_EXE=../../../src/memory-analyzer/memory-analyzer
55

66
clean:
7-
find -name '*.gb' -execdir $(RM) '{}' \;
8-
find -name '*.exe' -execdir $(RM) '{}' \;
9-
find -name '*.out' -execdir $(RM) '{}' \;
7+
find . -name '*.gb' -execdir $(RM) '{}' \;
8+
find . -name '*.exe' -execdir $(RM) '{}' \;
9+
find . -name '*.out' -execdir $(RM) '{}' \;
1010
$(RM) tests.log
1111

1212
test:

‎regression/smt2_solver/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ show:
1414
done;
1515

1616
clean:
17-
find -name '*.out' -execdir $(RM) '{}' \;
17+
find . -name '*.out' -execdir $(RM) '{}' \;
1818
$(RM) tests.log

‎regression/smt2_strings/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ show:
1414
done;
1515

1616
clean:
17-
find -name '*.out' -execdir $(RM) '{}' \;
17+
find . -name '*.out' -execdir $(RM) '{}' \;
1818
$(RM) tests.log

‎regression/snapshot-harness/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ show:
2020
done;
2121

2222
clean:
23-
find -name '*.out' -execdir $(RM) '{}' \;
24-
find -name '*.gb' -execdir $(RM) '{}' \;
25-
find -name '*.json' -execdir $(RM) '{}' \;
23+
find . -name '*.out' -execdir $(RM) '{}' \;
24+
find . -name '*.gb' -execdir $(RM) '{}' \;
25+
find . -name '*.json' -execdir $(RM) '{}' \;
2626
$(RM) tests.log

‎regression/solver-hardness/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ show:
2222
done;
2323

2424
clean:
25-
find -name '*.out' -execdir $(RM) '{}' \;
25+
find . -name '*.out' -execdir $(RM) '{}' \;
2626
$(RM) tests.log

‎regression/statement-list/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ show:
1313
done;
1414

1515
clean:
16-
find -name '*.out' -execdir $(RM) '{}' \;
17-
find -name '*.smt2' -execdir $(RM) '{}' \;
16+
find . -name '*.out' -execdir $(RM) '{}' \;
17+
find . -name '*.smt2' -execdir $(RM) '{}' \;
1818
$(RM) tests.log

‎regression/strings/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ show:
2020
done;
2121

2222
clean:
23-
find -name '*.out' -execdir $(RM) '{}' \;
24-
find -name '*.gb' -execdir $(RM) '{}' \;
23+
find . -name '*.out' -execdir $(RM) '{}' \;
24+
find . -name '*.gb' -execdir $(RM) '{}' \;
2525
$(RM) tests.log
2626

‎regression/systemc/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ show:
3939
done;
4040

4141
clean:
42-
find -name '*.out' -execdir $(RM) '{}' \;
43-
find -name '*.gb' -execdir $(RM) '{}' \;
42+
find . -name '*.out' -execdir $(RM) '{}' \;
43+
find . -name '*.gb' -execdir $(RM) '{}' \;
4444
$(RM) tests.log

‎regression/validate-trace-xml-schema/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
test:
33
sh check.sh
44
clean:
5-
find -name '*.out' -execdir $(RM) '{}' \;
6-
find -name '*.gb' -execdir $(RM) '{}' \;
5+
find . -name '*.out' -execdir $(RM) '{}' \;
6+
find . -name '*.gb' -execdir $(RM) '{}' \;
77
$(RM) tests.log
88

0 commit comments

Comments
 (0)