Merge pull request diffblue#2513 from tautschnig/clean

Regression test clean target and test.pl fix

Author: tautschnig

jbmc/regression/jbmc-strings/Makefile

@@ -28,4 +28,4 @@ show:
 clean:
 	find -name '*.out' -execdir $(RM) '{}' \;
 	find -name '*.gb' -execdir $(RM) '{}' \;
-	$(RM) tests.log
+	$(RM) tests.log tests-symex-driven-loading.log

jbmc/regression/jbmc/Makefile

@@ -20,7 +20,7 @@ show:
 clean:
 	find -name '*.out' -execdir $(RM) '{}' \;
 	find -name '*.gb' -execdir $(RM) '{}' \;
-	$(RM) tests.log
+	$(RM) tests.log tests-symex-driven-loading.log
 
 %.class: %.java ../../src/org.cprover.jar
 	javac -g -cp ../../src/org.cprover.jar:. $<

regression/cbmc/Makefile

@@ -15,5 +15,5 @@ show:
 
 clean:
 	find -name '*.out' -execdir $(RM) '{}' \;
-	find -name '*.gb' -execdir $(RM) '{}' \;
+	find -name '*.smt2' -execdir $(RM) '{}' \;
 	$(RM) tests.log

regression/goto-gcc/Makefile

@@ -18,4 +18,5 @@ show:
 clean:
 	find -name '*.out' -execdir $(RM) '{}' \;
 	find -name '*.gb' -execdir $(RM) '{}' \;
+	find -name '*.goto-cc-saved' -execdir $(RM) '{}' \;
 	$(RM) tests.log

regression/invariants/Makefile

@@ -25,3 +25,8 @@ show:
 
 driver$(EXEEXT): $(OBJ)
 	$(LINKBIN)
+
+clean:
+	find -name '*.out' -execdir $(RM) '{}' \;
+	$(RM) driver$(EXEEXT) driver$(DEPEXT) driver$(OBJEXT)
+	$(RM) tests.log

regression/test.pl

@@ -421,7 +421,7 @@ ($)
 close LOG;
 
 if($opt_p && $failures != 0) {
-  open LOG,"<tests.log" or die "Failed to open tests.log\n";
+  open LOG,"<$logfile_name" or die "Failed to open $logfile_name\n";
 
   my $printed_this_test = 1;
   my $current_test = "";