Skip to content

Commit f6419b0

Browse files
committed
Add missing cleanup
make clean did not actually remove all files. Includes disabling an export-symex-ready-goto test with --xml-ui for check.py will wrap the `""` argument and make the test produce an actual goto binary in a file named `""`.
1 parent ce66557 commit f6419b0

File tree

12 files changed

+13
-8
lines changed

12 files changed

+13
-8
lines changed

regression/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,7 @@ test-parallel:
114114

115115
.PHONY: clean
116116
clean:
117-
@for dir in *; do \
118-
if [ -d "$$dir" ]; then \
119-
$(MAKE) -C "$$dir" clean; \
120-
fi; \
117+
@for dir in $(DIRS); do \
118+
$(MAKE) -C "$$dir" clean; \
121119
done;
122120
$(RM) tests.log

regression/ansi-c/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ build_goto_binaries:
6464
clean:
6565
find . -name '*.out' -execdir $(RM) '{}' \;
6666
find . -name '*.gb' -execdir $(RM) '{}' \;
67-
$(RM) tests.log tests-c++-front-end.log
67+
$(RM) tests*.log

regression/catch-framework/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ test:
66
tests.log: ../test.pl test
77

88
clean:
9+
find . -name '*.out' -execdir $(RM) '{}' \;
910
$(RM) tests*.log

regression/cbmc-primitives/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ tests.log: ../test.pl
1111

1212
clean:
1313
find . -name '*.out' -execdir $(RM) '{}' \;
14-
$(RM) tests.log
14+
$(RM) tests*.log

regression/cbmc/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,5 @@ tests.log: ../test.pl test
3939
clean:
4040
find . -name '*.out' -execdir $(RM) '{}' \;
4141
find . -name '*.smt2' -execdir $(RM) '{}' \;
42+
$(RM) export-symex-ready-goto/exported.symex.ready.goto
4243
$(RM) tests*.log

regression/contracts-dfcc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ tests.log: ../test.pl test
3434

3535
clean:
3636
@for dir in *; do \
37-
$(RM) tests.log; \
3837
if [ -d "$$dir" ]; then \
3938
cd "$$dir"; \
4039
$(RM) *.out *.gb *.smt2; \
4140
cd ..; \
4241
fi \
4342
done
43+
$(RM) tests*.log

regression/cprover/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ test-no-p:
1010
@../test.pl -e -c '../../../src/cprover/cprover'
1111

1212
clean:
13+
find . -name '*.out' -execdir $(RM) '{}' \;
1314
$(RM) tests.log

regression/goto-harness/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@ tests.log: ../test.pl
2323
clean:
2424
find . -name '*.out' -execdir $(RM) '{}' \;
2525
find . -name '*.gb' -execdir $(RM) {} \;
26+
find . -name '*-harness.c' -execdir $(RM) {} \;
2627
$(RM) tests.log

regression/goto-instrument/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ clean:
2626
cd ..; \
2727
fi \
2828
done
29+
$(RM) ../cbmc/Recursion6/*.gb

regression/solver-hardness/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ tests.log: ../test.pl test
1616

1717
clean:
1818
find . -name '*.out' -execdir $(RM) '{}' \;
19+
find . -name '*.json' -execdir $(RM) '{}' \;
1920
$(RM) tests.log

regression/validate-trace-xml-schema/check.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
# these test for invalid command line handling
4242
['bad_option', 'test_multiple.desc'],
4343
['bad_option', 'test.desc'],
44+
['export-symex-ready-goto', 'test-bad-usage.desc'],
4445
['unknown-argument-suggestion', 'test.desc'],
4546
['sat-solver-error', 'test.desc'],
4647
# this one produces XML intermingled with main XML output when used with --xml-ui

unit/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ memory-analyzer/test.inc: memory-analyzer/test.c
303303
memory-analyzer/gdb_api$(OBJEXT): memory-analyzer/input.inc memory-analyzer/test.inc
304304

305305
CLEANFILES = $(CATCH_TEST) testing-utils/testing-utils$(LIBEXT) \
306-
memory-analyzer/input.inc memory-analyzer/test.inc
306+
memory-analyzer/input.inc memory-analyzer/test.inc gdb.txt
307307

308308
# only add a dependency for libraries to avoid triggering implicit rules, which
309309
# would cause unnecessary rebuilds

0 commit comments

Comments
 (0)