From 208c4f45c8c9b533330b5380e34338c8eabcd024 Mon Sep 17 00:00:00 2001
From: Michael Sawyer <source@isc.org>
Date: Fri, 19 May 2000 23:55:37 +0000
Subject: [PATCH] clean up test output

---
 bin/tests/system/dnssec/tests.sh |  8 +++++++-
 bin/tests/system/notify/tests.sh | 10 +++++++---
 bin/tests/system/run.sh          |  6 ++++++
 bin/tests/system/views/tests.sh  | 10 +++++++---
 bin/tests/system/xfer/tests.sh   | 10 +++++++---
 5 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index 7c1df7df2e..e9964130e2 100644
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -15,6 +15,10 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
+echo "S:`date`"
+echo "T:system_dnssec:1"
+echo "A:A test to determine online functionality of dnssec tools"
+
 #
 # Perform tests
 #
@@ -123,6 +127,8 @@ echo "SERVFAIL is expected in the following:"
 grep ";" dig.out.ns4
 
 if [ $status != 0 ]; then
-	echo "FAILED with status $status"
+	echo "R:FAIL"
+else
+	echo "R:PASS"
 fi
 
diff --git a/bin/tests/system/notify/tests.sh b/bin/tests/system/notify/tests.sh
index be6f75c051..8a18276f4f 100644
--- a/bin/tests/system/notify/tests.sh
+++ b/bin/tests/system/notify/tests.sh
@@ -15,6 +15,10 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
+echo "S:`date`"
+echo "T:system_notify:1"
+echo "A:A test to determine online functionality of notify"
+
 #
 # Perform tests
 #
@@ -103,7 +107,7 @@ perl ../digcomp.pl dig.out.ns2 dig.out.ns3
 status=`expr $status + $?`
 
 if [ $status != 0 ]; then
-	echo "FAILED with status $status"
+	echo "R:FAIL"
+else
+	echo "R:PASS"
 fi
-
-exit $status
diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index defa56c4c6..2d2ddc8043 100644
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -20,6 +20,12 @@
 #
 . ./conf.sh
 
+whoami=`whoami`
+if [ $whoami != "root" ]; then
+	echo "I:System tests must be run as root."
+	exit
+fi
+
 sh ifconfig.sh start
 
 if [ $? != 0 ]; then
diff --git a/bin/tests/system/views/tests.sh b/bin/tests/system/views/tests.sh
index 7c5f81adfd..8b635e64ab 100644
--- a/bin/tests/system/views/tests.sh
+++ b/bin/tests/system/views/tests.sh
@@ -15,6 +15,10 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
+echo "S:`date`"
+echo "T:system_views:1"
+echo "A:A test to determine online functionality of views"
+
 #
 # Perform tests
 #
@@ -77,7 +81,7 @@ if [ $? = 0 ]; then
 fi
 
 if [ $status != 0 ]; then
-	echo "FAILED with status $status"
+	echo "R:FAIL"
+else
+	echo "R:PASS"
 fi
-
-exit $status
diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh
index 3dedf87ac0..26fa59577d 100644
--- a/bin/tests/system/xfer/tests.sh
+++ b/bin/tests/system/xfer/tests.sh
@@ -15,6 +15,10 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
+echo "S:`date`"
+echo "T:system_xfer:1"
+echo "A:A test to determine online functionality of domain name transfers"
+
 #
 # Perform tests
 #
@@ -45,7 +49,7 @@ perl ../digcomp.pl knowngood.dig.out dig.out.ns3
 status=`expr $status + $?`
 
 if [ $status != 0 ]; then
-	echo "FAILED with status $status"
+	echo "R:FAIL"
+else
+	echo "R:PASS"
 fi
-
-exit $status