Merge UNTESTED and SKIPPED system test results

Descriptions of UNTESTED and SKIPPED system test results are very
similar to one another and it may be confusing when to pick one and
when the other. Merging these two system test results removes the
confusion.

(cherry picked from commit 29d7c6e449f74653fd911e856b8b06a7f9994891)

diff --git a/bin/tests/system/README b/bin/tests/system/README
index 7a77365bf2eb6b142451a1a2b0ddcb14d9b2f32c..06bf2f0063fef59d8ee2250be45a202fdd840141 100644 (file)
--- a/bin/tests/system/README
+++ b/bin/tests/system/README
@@ -214,9 +214,6 @@ This indicates the type of message.  This is one of:
             FAIL        The test failed
             SKIPPED     The test was not run, usually because some
                         prerequisites required to run the test are missing.
-            UNTESTED    The test was not run for some other reason, e.g. a
-                        prerequisite is available but is not compatible with
-                        the platform on which the test is run.
 
 <test-name>
 This is the name of the test from which the message emanated, which is also the
@@ -270,9 +267,9 @@ As noted above, each test is in a separate directory.  To interact with the
 test framework, the directories contain the following standard files:
 
 prereq.sh   Run at the beginning to determine whether the test can be run at
-            all; if not, we see a result of R:SKIPPED or R:UNTESTED.  This file
-            is optional: if not present, the test is assumed to have all its
-            prerequisites met.
+            all; if not, we see a R:SKIPPED result.  This file is optional:
+            if not present, the test is assumed to have all its prerequisites
+            met.
 
 setup.sh    Run after prereq.sh, this sets up the preconditions for the tests.
             Although optional, virtually all tests will require such a file to

diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index 2168b9db4d16120e4a98b5523945d755e633195d..8e2e97c94a2012537a9600cadaa8d4427596a402 100755 (executable)
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -157,14 +157,14 @@ echoinfo  "I:$systest:PORTRANGE:${LOWPORT} - ${HIGHPORT}"
 if [ x${PERL:+set} = x ]
 then
     echowarn "I:$systest:Perl not available.  Skipping test."
-    echowarn "R:$systest:UNTESTED"
+    echowarn "R:$systest:SKIPPED"
     echoend  "E:$systest:$(date_with_args)"
     exit 0;
 fi
 
 $PERL testsock.pl -p $PORT  || {
     echowarn "I:$systest:Network interface aliases not set up.  Skipping test."
-    echowarn "R:$systest:UNTESTED"
+    echowarn "R:$systest:SKIPPED"
     echoend  "E:$systest:$(date_with_args)"
     exit 0;
 }
@@ -177,7 +177,7 @@ if [ $result -eq 0 ]; then
     : prereqs ok
 else
     echowarn "I:$systest:Prerequisites missing, skipping test."
-    [ $result -eq 255 ] && echowarn "R:$systest:SKIPPED" || echowarn "R:$systest:UNTESTED"
+    echowarn "R:$systest:SKIPPED";
     echoend "E:$systest:$(date_with_args)"
     exit 0
 fi