|
From: <sv...@va...> - 2006-04-03 14:25:32
|
Author: njn
Date: 2006-04-03 15:25:23 +0100 (Mon, 03 Apr 2006)
New Revision: 5817
Log:
Add an optional post-test check. Based on a patch from Josef W.
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 2006-04-02 22:23:27 UTC (rev 5816)
+++ trunk/tests/vg_regtest.in 2006-04-03 14:25:23 UTC (rev 5817)
@@ -50,6 +50,7 @@
# - stdout_filter: <filter to run stdout through> (default: none)
# - stderr_filter: <filter to run stderr through> (default: ./filter_s=
tderr)
# - prereq: <prerequisite command> (default: none)
+# - posttest: <post-test check command> (default: none)
# - cleanup: <post-test cleanup cmd to run> (default: none)
#
# Note that filters are necessary for stderr results to filter out thing=
s that
@@ -60,7 +61,8 @@
# stderr (filtered) is kept in <test>.stderr.exp[0-9]*.=20
#
# The prerequisite command, if present, must return 0 otherwise the test=
is
-# skipped.
+# skipped. The post-test command, if present, must return 0 and its std=
out
+# must match the expected stdout which is kept in <test>.posttest.exp[0-=
9]*.
#
# 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]=
*.
@@ -86,12 +88,13 @@
my $stdout_filter; # filter program to run stdout results file thro=
ugh
my $stderr_filter; # filter program to run stderr results file thro=
ugh
my $prereq; # prerequisite test to satisfy before running te=
st
+my $posttest; # check command after running test
my $cleanup; # cleanup command to run
=20
my @failures; # List of failed tests
=20
my $num_tests_done =3D 0;
-my %num_failures =3D (stderr =3D> 0, stdout =3D> 0);
+my %num_failures =3D (stderr =3D> 0, stdout =3D> 0, posttest =3D>=
0);
=20
# Default valgrind to use is this build tree's (uninstalled) one
my $valgrind =3D "./coregrind/valgrind";
@@ -172,8 +175,9 @@
my ($f) =3D @_;
=20
# Defaults.
- ($vgopts, $prog, $args, $stdout_filter, $stderr_filter, $prereq, $cl=
eanup)
- =3D ("", undef, "", undef, undef, undef, undef);
+ ($vgopts, $prog, $args) =3D ("", undef, "");
+ ($stdout_filter, $stderr_filter) =3D (undef, undef);
+ ($prereq, $posttest, $cleanup) =3D (undef, undef, undef);
=20
# Every test directory must have a "filter_stderr"
$stderr_filter =3D validate_program(".", $default_stderr_filter, 1, =
1);
@@ -195,6 +199,8 @@
$stderr_filter =3D validate_program(".", $1, 1, 1);
} elsif ($line =3D~ /^\s*prereq:\s*(.*)$/) {
$prereq =3D $1;
+ } elsif ($line =3D~ /^\s*posttest:\s*(.*)$/) {
+ $posttest =3D $1;
} elsif ($line =3D~ /^\s*cleanup:\s*(.*)$/) {
$cleanup =3D $1;
} else {
@@ -287,25 +293,36 @@
. "--tool=3D$tool $vgopts "
. "$prog $args > $name.stdout.out 2> $name.stderr.out");
=20
+ # Filter stdout
if (defined $stdout_filter) {
mysystem("$stdout_filter < $name.stdout.out > $tmp");
rename($tmp, "$name.stdout.out");
}
-
- mysystem("$stderr_filter < $name.stderr.out > $tmp");
- rename($tmp, "$name.stderr.out");
-
-
# Find all the .stdout.exp files. If none, use /dev/null.
my @stdout_exps =3D <$name.stdout.exp*>;
@stdout_exps =3D ( "/dev/null" ) if (0 =3D=3D scalar @stdout_exps);
+ do_diffs($fullname, $name, "stdout", \@stdout_exps);=20
=20
+ # Filter stderr
+ mysystem("$stderr_filter < $name.stderr.out > $tmp");
+ rename($tmp, "$name.stderr.out");
# Find all the .stderr.exp files. $name.stderr.exp must exist.
my @stderr_exps =3D <$name.stderr.exp*>;
(-r "$name.stderr.exp") or die "Could not read `$name.stderr.exp'\n"=
;
- =20
- do_diffs($fullname, $name, "stdout", \@stdout_exps);=20
do_diffs($fullname, $name, "stderr", \@stderr_exps);=20
+
+ # Maybe do post-test check
+ if (defined $posttest) {
+ if (mysystem("$posttest > $name.posttest.out") !=3D 0) {
+ print("posttest failed: $posttest\n");
+ $num_failures{"posttest"}++;
+ } else {
+ # Find all the .posttest.exp files. If none, use /dev/null.
+ my @posttest_exps =3D <$name.posttest.exp*>;
+ @posttest_exps =3D ( "/dev/null" ) if (0 =3D=3D scalar @posttest_ex=
ps);
+ do_diffs($fullname, $name, "posttest", \@posttest_exps);
+ }
+ }
=20
if (defined $cleanup) {
(system("$cleanup") =3D=3D 0) or=20
@@ -375,10 +392,12 @@
{
my $x =3D ( $num_tests_done =3D=3D 1 ? "test" : "tests" );
=20
- printf("\n=3D=3D %d test%s, %d stderr failure%s, %d stdout failure%s=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n",=20
+ printf("\n=3D=3D %d test%s, %d stderr failure%s, %d stdout failure%s=
, "
+ . "%d posttest failure%s =3D=3D\n",=20
$num_tests_done, plural($num_tests_done),
- $num_failures{"stderr"}, plural($num_failures{"stderr"}),
- $num_failures{"stdout"}, plural($num_failures{"stdout"}));
+ $num_failures{"stderr"}, plural($num_failures{"stderr"}),
+ $num_failures{"stdout"}, plural($num_failures{"stdout"}),
+ $num_failures{"posttest"}, plural($num_failures{"posttest"}))=
;
=20
foreach my $failure (@failures) {
print "$failure\n";
@@ -415,7 +434,9 @@
}
summarise_results();
=20
-if (0 =3D=3D $num_failures{"stdout"} && 0 =3D=3D $num_failures{"stderr"}=
) {
+if (0 =3D=3D $num_failures{"stdout"} &&
+ 0 =3D=3D $num_failures{"stderr"} &&
+ 0 =3D=3D $num_failures{"posttest"}) {
exit 0;
} else {
exit 1;
|