From 29d7c6e449f74653fd911e856b8b06a7f9994891 Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Wed, 30 Dec 2020 13:22:46 +0100 Subject: [PATCH] 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. --- bin/tests/system/README | 9 +++------ bin/tests/system/run.sh.in | 6 +----- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/bin/tests/system/README b/bin/tests/system/README index a6d9558101..3bc6210a9a 100644 --- 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. 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 3a71afef08..99c93da1ca 100644 --- 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