Audit the use of the skip result

Report a skip for swint-emulation if the main purpose of the test is unable to
be performed.  However, run the first half of the tests against real hardware
to confirm that the algorithm is correct

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/docs/introduction.dox b/docs/introduction.dox
index b178e9f943b5446876b11250acfe33165d2486aa..3352dae3be56b1c411dbb142fe57d57ccc8cb088 100644 (file)
--- a/docs/introduction.dox
+++ b/docs/introduction.dox
@@ -170,7 +170,7 @@ The result is covered by the report.h API.  In short, the options are:
 - Success
     - The test passed.
 - Skip
-    - The test cannot be completed (likely a configuration issue).
+    - The test cannot be completed for configuration reasons.
 - Error
     - An error in the environment or test code itself.
 - Failure

diff --git a/include/xtf/report.h b/include/xtf/report.h
index 3d08fb0c0bbed22997c84888c46f022403c890f6..9a59d6f486521e5d72dea1ddc93784badd2b8ab2 100644 (file)
--- a/include/xtf/report.h
+++ b/include/xtf/report.h
@@ -16,8 +16,9 @@
  *  - Failure
  *
  * 'Success' indicates that everything went well, while 'Skip' indicates that
- * the test cannot be completed.  'Error' indicates a bug in the test code or
- * environment itself, while 'Failure' indicates a bug in the code under test.
+ * the test cannot be completed for configuration reasons.  'Error' indicates
+ * a bug in the test code or environment itself, while 'Failure' indicates a
+ * bug in the code under test.
  *
  * If multiple statuses are reported, the most severe is the one which is
  * kept.

diff --git a/tests/swint-emulation/main.c b/tests/swint-emulation/main.c
index 5807f771a81132dc2dcb61bf1c1c96dd5cfcc2fb..1f9f5053a4a5ca6a8462fe65842d11d17784ff5f 100644 (file)
--- a/tests/swint-emulation/main.c
+++ b/tests/swint-emulation/main.c
@@ -370,8 +370,12 @@ void test_main(void)
 {
     printk("Trap emulation\n");
 
+    /*
+     * Even if FEP is unavailable, run the tests against real hardware to
+     * check the algorithm, but don't claim overall success.
+     */
     if ( !xtf_has_fep )
-        xtf_warning("Warning: FEP support not detected - some tests will be skipped\n");
+        xtf_skip("FEP support not detected - some tests will be skipped\n");
 
     /* Setup.  Hook unhandled exceptions for debugging purposes. */
     xtf_unhandled_exception_hook = unhandled_exception;