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 and also makes system test more aligned with Automake,
which does not know about UNTESTED test result.

diff --git a/bin/tests/system/README b/bin/tests/system/README
index a6d955810135fb0d7f212cfe6832e168d3b06e2e..3bc6210a9a619a6bae6ed8f7049f2ebc45d231db 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.in b/bin/tests/system/run.sh.in
index 3a71afef08eaf0866eb3fc65be6e98fc26bea75f..99c93da1cacb815fa5e46c9bf5941e6be8c72a2c 100644 (file)
--- a/bin/tests/system/run.sh.in
+++ b/bin/tests/system/run.sh.in
@@ -166,11 +166,7 @@ if [ $result -eq 0 ]; then
     : prereqs ok
 else
     echowarn "I:$systest:Prerequisites missing, skipping test."
-    if [ $result -eq 255 ]; then
-        echowarn "R:$systest:SKIPPED";
-    else
-        echowarn "R:$systest:UNTESTED"
-    fi
+    echowarn "R:$systest:SKIPPED";
     echoend "E:$systest:$(date_with_args)"
     exit 77
 fi