Ignore Emacs temporary files. Also, produce the correct .diff filename when

the .exp filename has a non-numeric suffix.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7538

diff --git a/helgrind/tests/tc24_nonzero_sem.stderr.exp-glibc25-amd64 b/helgrind/tests/tc24_nonzero_sem.stderr.exp-glibc25-amd64
index d18786f80668a209115b4a13cf5e8afa8d9cd471..3b766545160db8a0a8a3d0b2e36440480b130ed5 100644 (file)
--- a/helgrind/tests/tc24_nonzero_sem.stderr.exp-glibc25-amd64
+++ b/helgrind/tests/tc24_nonzero_sem.stderr.exp-glibc25-amd64
@@ -1,3 +1,3 @@
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
+RROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in
index 9978a358610d8067d673d59d7a9909a5ad1b1c27..bc065da1cdc8dd89b3843dfc4d313d52f3e316a9 100755 (executable)
--- a/tests/vg_regtest.in
+++ b/tests/vg_regtest.in
@@ -64,7 +64,8 @@
 # Expected stdout (filtered) is kept in <test>.stdout.exp* (can be more
 # than one expected output).  It can be missing if it would be empty.  Expected
 # stderr (filtered) is kept in <test>.stderr.exp*.   There must be at least
-# one stderr.exp* file.
+# one stderr.exp* file.  Any .exp* file that ends in '~' or '#' is ignored;
+# this is because Emacs creates temporary files of these names.
 #
 # The prerequisite command, if present, must return 0 otherwise the test is
 # skipped.  The post-test command, if present, must return 0 and its stdout
@@ -263,22 +264,27 @@ sub do_diffs($$$$)
     for my $f_exp (@$f_exps) {
         (-r $f_exp) or die "Could not read `$f_exp'\n";
 
-        my $n = "";
-        if ($f_exp =~ /.*\.exp(\d*)/) {
-            $n = $1;
-        } else {
-            $n = "";
-            ($f_exp eq "/dev/null") or die "Unexpected .exp file: $f_exp\n";
-        }
+        # Emacs produces temporary files that end in '~' and '#'.  We ignore
+        # these.
+        if ($f_exp !~ /[~#]$/) {
+            # $n is the (optional) suffix after the ".exp";  we tack it onto
+            # the ".diff" file.
+            my $n = "";
+            if ($f_exp =~ /.*\.exp(.*)$/) {
+                $n = $1;
+            } else {
+                $n = "";
+                ($f_exp eq "/dev/null") or die "Unexpected .exp file: $f_exp\n";
+            }
 
-        #print("diff $f_exp $name.$mid.out > $name.$mid.diff$n\n");
-        mysystem("diff $f_exp $name.$mid.out > $name.$mid.diff$n");
+            mysystem("diff $f_exp $name.$mid.out > $name.$mid.diff$n");
 
-        if (not -s "$name.$mid.diff$n") {
-            # A match;  remove .out and any previously created .diff files.
-            unlink("$name.$mid.out");
-            unlink(<$name.$mid.diff*>);
-            return;
+            if (not -s "$name.$mid.diff$n") {
+                # A match;  remove .out and any previously created .diff files.
+                unlink("$name.$mid.out");
+                unlink(<$name.$mid.diff*>);
+                return;
+            }
         }
     }
     # If we reach here, none of the .exp files matched.