Changeset 20109 in vbox

Timestamp:

May 27, 2009 10:49:29 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

47863

Message:

RTTestSkipAndDestroy.

Location:

trunk

Files:

• include/iprt/test.h (modified) (1 diff)
• src/VBox/Runtime/r3/test.cpp (modified) (3 diffs)

trunk/include/iprt/test.h

@@ -203 +203 @@
 
 /**
+ * Skips the test, destroys the test instance and return an exit code.
+ *
+ * @returns Test program exit code.
+ * @param   hTest           The test handle. If NIL_RTTEST we'll use the one
+ *                          associated with the calling thread.
+ * @param   pszReasonFmt    Text explaining why, optional (NULL).
+ * @param   va              Arguments for the reason format string.
+ */
+RTR3DECL(int) RTTestSkipAndDestroyV(RTTEST hTest, const char *pszReason, va_list va);
+
+/**
+ * Skips the test, destroys the test instance and return an exit code.
+ *
+ * @returns Test program exit code.
+ * @param   hTest           The test handle. If NIL_RTTEST we'll use the one
+ *                          associated with the calling thread.
+ * @param   pszReasonFmt    Text explaining why, optional (NULL).
+ * @param   va              Arguments for the reason format string.
+ */
+RTR3DECL(int) RTTestSkipAndDestroy(RTTEST hTest, const char *pszReason, ...);
+
+/**
  * Starts a sub-test.
  *

trunk/src/VBox/Runtime/r3/test.cpp

@@ -166 +166 @@
 *******************************************************************************/
 static void rtTestGuardedFreeOne(PRTTESTGUARDEDMEM pMem);
+static int rtTestPrintf(PRTTESTINT pTest, const char *pszFormat, ...);
 
 
@@ -304 +305 @@
 
     /*
+     * Make sure we end with a new line.
+     */
+    if (!pTest->fNewLine)
+        rtTestPrintf(pTest, "\n");
+
+    /*
      * Clean up.
      */
@@ -786 +793 @@
     }
 
-
     RTTestDestroy(pTest);
+    return rc;
+}
+
+
+RTR3DECL(int) RTTestSkipAndDestroyV(RTTEST hTest, const char *pszReason, va_list va)
+{
+    PRTTESTINT pTest = hTest;
+    RTTEST_GET_VALID_RETURN_RC(pTest, 2);
+
+    RTCritSectEnter(&pTest->Lock);
+    rtTestSubTestReport(pTest);
+    RTCritSectLeave(&pTest->Lock);
+
+    int rc;
+    if (!pTest->cErrors)
+    {
+        if (pszReason)
+            RTTestPrintfNlV(hTest, RTTESTLVL_FAILURE, pszReason, va);
+        RTTestPrintfNl(hTest, RTTESTLVL_ALWAYS, "SKIPPED\n", pTest->cErrors);
+        rc = 2;
+    }
+    else
+    {
+        RTTestPrintfNl(hTest, RTTESTLVL_ALWAYS, "FAILURE - %u errors\n", pTest->cErrors);
+        rc = 1;
+    }
+
+    RTTestDestroy(pTest);
+    return rc;
+}
+
+
+RTR3DECL(int) RTTestSkipAndDestroy(RTTEST hTest, const char *pszReason, ...)
+{
+    va_list va;
+    va_start(va, pszReason);
+    int rc = RTTestSkipAndDestroyV(hTest, pszReason, va);
+    va_end(va);
     return rc;
 }