From a9b5a3fbf9472b3f484dabc2902ef8fd8403ee3c Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Tue, 1 Nov 2016 13:47:33 -0700
Subject: [PATCH] [v9_9] clean up reporting of R:FAIL so it can't spuriously
 appear mid-test

(cherry picked from commit 7960fc596b09ae2edcac4fd9759b5cbb30832810)
---
 bin/tests/system/run.sh   | 2 +-
 bin/tests/system/start.pl | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index 0b0e11f984..e3ca63b314 100644
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -89,7 +89,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 4d1816fa93..733e16c09b 100644
--- a/bin/tests/system/start.pl
+++ b/bin/tests/system/start.pl
@@ -131,7 +131,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;
 		}
@@ -247,7 +247,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;
 	}
@@ -274,7 +274,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;
@@ -314,7 +314,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;
 		}