|
From: <sv...@va...> - 2005-06-29 04:02:27
|
Author: njn
Date: 2005-06-29 05:02:24 +0100 (Wed, 29 Jun 2005)
New Revision: 4050
Log:
Fix vg_regtests so it can properly handle alternative output filenames wi=
th
more than one numeric char at the end (eg. xml1.stderr.exp64).
Modified:
trunk/tests/vg_regtest.in
Modified: trunk/tests/vg_regtest.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tests/vg_regtest.in 2005-06-29 03:54:09 UTC (rev 4049)
+++ trunk/tests/vg_regtest.in 2005-06-29 04:02:24 UTC (rev 4050)
@@ -55,15 +55,15 @@
# Note that filters are necessary for stderr results to filter out thing=
s that
# always change, eg. process id numbers.
#
-# Expected stdout (filtered) is kept in <test>.stdout.exp[0-9]? (can be =
more
+# Expected stdout (filtered) is kept in <test>.stdout.exp[0-9]* (can be =
more
# than one expected output). It can be missing if it would be empty. E=
xpected
-# stderr (filtered) is kept in <test>.stderr.exp[0-9]?.=20
+# stderr (filtered) is kept in <test>.stderr.exp[0-9]*.=20
#
# The prerequisite command, if present, must return 0 otherwise the test=
is
# skipped.
#
# If results don't match, the output can be found in <test>.std<strm>.ou=
t,
-# and the diff between expected and actual in <test>.std<strm>.diff[0-9]=
?.
+# and the diff between expected and actual in <test>.std<strm>.diff[0-9]=
*.
#
# Notes on adding regression tests for a new tool are in
# coregrind/docs/coregrind_tools.html.
@@ -236,7 +236,7 @@
(-r $f_exp) or die "Could not read `$f_exp'\n";
=20
my $n =3D "";
- if ($f_exp =3D~ /.*\.exp(\d?)/) {
+ if ($f_exp =3D~ /.*\.exp(\d*)/) {
$n =3D $1;
} else {
$n =3D "";
|