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

diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index 01e6e6c4be8ad460041c498f33f357bc1ce91adf..150f3b505bd30446d0719b00f2cf77303e5bc25c 100644 (file)
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -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 )

diff --git a/bin/tests/system/start.pl b/bin/tests/system/start.pl
index 0d452264b2c93b28351536aa31e03b06671a8816..55256c5cd8fa4598f86122633220ca5b80d3877e 100644 (file)
--- a/bin/tests/system/start.pl
+++ b/bin/tests/system/start.pl
@@ -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;
                }