Changeset 47553 in vbox for trunk/src/VBox

Timestamp:

Aug 6, 2013 10:03:55 AM (11 years ago)

Author:

vboxsync

Message:

Fix R0 timer testcase on darwin and make it possible to skip R0 tests when the feature is not supported (for the timer testcase it is the RTTIMER_FLAGS_CPU_ALL flag which is not supported on darwin)

Location:

trunk/src/VBox/Runtime/testcase

Files:

• tstRTR0Common.h (modified) (2 diffs)
• tstRTR0CommonDriver.h (modified) (3 diffs)
• tstRTR0Timer.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/testcase/tstRTR0Common.h

@@ -177 +177 @@
     } while (0)
 
+/**
+ * Macro for skipping a test in the ring-0 testcase.
+ */
+#define RTR0TESTR0_SKIP() \
+    do { \
+        RTR0TestR0Skip("line %u: SKIPPED", __LINE__); \
+    } while (0)
+
+/**
+ * Same as RTR0TESTR0_SKIP + break.
+ */
+#define RTR0TESTR0_SKIP_BREAK() \
+    if (1) \
+    { \
+        RTR0TestR0Skip("line %u: SKIPPED", __LINE__); \
+        break; \
+    } else do { } while (0)
+
 
 /**
@@ -245 +263 @@
 }
 
+
+/**
+ * Report an error.
+ */
+void RTR0TestR0Skip(const char *pszFormat, ...)
+{
+    size_t off = RTStrNLen(g_szErr, sizeof(g_szErr) - 1);
+    size_t cbLeft = sizeof(g_szErr) - off;
+    if (cbLeft > 10)
+    {
+        char *psz = &g_szErr[off];
+        if (off)
+        {
+            *psz++  = '\n';
+            *psz++  = '\n';
+            cbLeft -= 2;
+        }
+        *psz++ = '$';
+        cbLeft--;
+
+        va_list va;
+        va_start(va, pszFormat);
+        RTStrPrintfV(psz, cbLeft, pszFormat, va);
+        va_end(va);
+    }
+    ASMAtomicIncU32(&g_cErrors);
+}
+
+
 /**
  * Checks if we have any error reports.

trunk/src/VBox/Runtime/testcase/tstRTR0CommonDriver.h

@@ -178 +178 @@
      * We can have multiple failures and info messages packed into szMsg.  They
      * are separated by a double newline.  The kind of message is indicated by
-     * the first character, '!' means error and '?' means info message.
+     * the first character, '!' means error and '?' means info message. '$' means
+     * the test was skipped because a feature is not supported on the host.
      */
     bool fRc = true;
@@ -190 +191 @@
             char *pszCur = pszNext;
             do
-                pszNext = strpbrk(pszNext + 1, "!?");
+                pszNext = strpbrk(pszNext + 1, "!?$");
             while (pszNext && (pszNext[-1] != '\n' || pszNext[-2] != '\n'));
 
@@ -203 +204 @@
                 fRc = false;
             }
+            else if (*pszCur == '$')
+            {
+                RTTestSkipped(g_hTest, "%s", pszCur + 1);
+            }
             else
                 RTTestPrintfNl(g_hTest, RTTESTLVL_ALWAYS, "%s", pszCur + 1);

trunk/src/VBox/Runtime/testcase/tstRTR0Timer.cpp

@@ -481 +481 @@
                 {
                     RTR0TESTR0_CHECK_RC_BREAK(RTTimerStart(pTimer, cNsSysHz * iTest), VINF_SUCCESS);
-                    for (uint32_t i = 0; i < 1000 && ASMAtomicUoReadU32(&State.cShots) < 1; i++)
+                    for (uint32_t i = 0; i < 1000 && (ASMAtomicUoReadU32(&State.cShots) < 1 || State.rc == VERR_IPE_UNINITIALIZED_STATUS); i++)
                         RTThreadSleep(5);
                     RTR0TESTR0_CHECK_MSG_BREAK(ASMAtomicReadU32(&State.cShots) == 1, ("cShots=%u\n", State.cShots));
@@ -724 +724 @@
             uint32_t        fFlags = (TSTRTR0TIMER_IS_HIRES(uOperation) ? RTTIMER_FLAGS_HIGH_RES : 0)
                                    | RTTIMER_FLAGS_CPU_ALL;
-            RTR0TESTR0_CHECK_RC_BREAK(RTTimerCreateEx(&pTimer, cNsInterval, fFlags, tstRTR0TimerCallbackOmni, paStates),
-                                      VINF_SUCCESS);
+            int             rc = RTTimerCreateEx(&pTimer, cNsInterval, fFlags, tstRTR0TimerCallbackOmni, paStates);
+            if (rc == VERR_NOT_SUPPORTED)
+                RTR0TESTR0_SKIP_BREAK();
+            RTR0TESTR0_CHECK_RC_BREAK(rc, VINF_SUCCESS);
 
             for (uint32_t iTest = 0; iTest < 3 && !RTR0TestR0HaveErrors(); iTest++)