Commit 7960fc59 authored by Evan Hunt's avatar Evan Hunt
Browse files

[master] clean up reporting of R:FAIL so it can't spuriously appear mid-test

parent 9bfebc4a
......@@ -80,7 +80,7 @@ then
fi
# Start name servers running
$PERL start.pl $test || { echo "E:$test:`date`"; exit 1; }
$PERL start.pl $test || { echo "R:FAIL"; echo "E:$test:`date`"; exit 1; }
# Run the tests
( cd $test ; $SHELL tests.sh )
......
......@@ -120,7 +120,7 @@ sub check_ports {
if (++$tries > 4) {
print "$0: could not bind to server addresses, still running?\n";
print "I:server sockets not available\n";
print "R:FAIL\n";
print "I:failed\n";
system("$PERL $topdir/stop.pl $testdir"); # Is this the correct behavior?
exit 1;
}
......@@ -245,7 +245,7 @@ sub start_server {
$pid_file = "ans.pid";
} else {
print "I:Unknown server type $server\n";
print "R:FAIL\n";
print "I:failed\n";
system "$PERL $topdir/stop.pl $testdir";
exit 1;
}
......@@ -272,7 +272,7 @@ sub start_server {
while (!-s $pid_file) {
if (++$tries > 140) {
print "I:Couldn't start server $server (pid=$child)\n";
print "R:FAIL\n";
print "I:failed\n";
system "kill -9 $child" if ("$child" ne "");
system "$PERL $topdir/stop.pl $testdir";
exit 1;
......@@ -312,7 +312,7 @@ sub verify_server {
if (++$tries >= 30) {
print `grep ";" dig.out > /dev/null`;
print "I:no response from $server\n";
print "R:FAIL\n";
print "I:failed\n";
system("$PERL $topdir/stop.pl $testdir");
exit 1;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment