Changeset 47745 in vbox for trunk/src/VBox/Runtime

Timestamp:

Aug 15, 2013 7:24:10 AM (11 years ago)

Author:

vboxsync

Message:

tstRTR0Timer: mask out one-shot drivers from Solaris (currently not supported)

Location:

trunk/src/VBox/Runtime/testcase

Files:

• tstRTR0Timer.cpp (modified) (1 diff)
• tstRTR0TimerDriver.cpp (modified) (2 diffs)

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

@@ -401 +401 @@
             {
                 RT_ZERO(State); ASMAtomicWriteU32(&State.cShots, State.cShots);
-                int rc = RTTimerStart(pTimer, 0);
-                if (rc == VERR_NOT_SUPPORTED)
-                {
-                    RTR0TestR0Info("one-shot timer are not supported, skipping\n");
-                    break;
-                }
-                
-                RTR0TESTR0_CHECK_RC_BREAK(rc, VINF_SUCCESS);
+                RTR0TESTR0_CHECK_RC_BREAK(RTTimerStart(pTimer, 0), VINF_SUCCESS);
                 for (uint32_t i = 0; i < 1000 && !ASMAtomicUoReadU32(&State.cShots); i++)
                     RTThreadSleep(5);

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

@@ -61 +61 @@
      * Standard timers.
      */
+#  ifndef RT_OS_SOLARIS // one-shot timers currently not supported on Solaris
     RTR3TestR0SimpleTest(TSTRTR0TIMER_ONE_SHOT_BASIC,       "Basic one shot");
+#  endif
     RTR3TestR0SimpleTest(TSTRTR0TIMER_PERIODIC_BASIC,       "Basic periodic");
     if (RTTestErrorCount(g_hTest) == 0)
     {
 #  if 1
+#   ifndef RT_OS_SOLARIS // one-shot timers currently not supported on Solaris
         RTR3TestR0SimpleTest(TSTRTR0TIMER_ONE_SHOT_RESTART, "Restart one shot from callback");
         RTR3TestR0SimpleTest(TSTRTR0TIMER_ONE_SHOT_DESTROY, "Destroy one shot from callback");
+#   endif
         RTR3TestR0SimpleTest(TSTRTR0TIMER_PERIODIC_CSSD_LOOPS, "Create-start-stop-destroy loops");
         for (uint32_t i = 0; i <= 7; i++)
             RTR3TestR0SimpleTestWithArg(TSTRTR0TIMER_PERIODIC_CHANGE_INTERVAL, i, "Change interval from callback, variation %u", i);
 #  endif
+#   ifndef RT_OS_SOLARIS // one-shot timers currently not supported on Solaris
         RTR3TestR0SimpleTest(TSTRTR0TIMER_ONE_SHOT_SPECIFIC, "One shot cpu specific");
+#   endif
         RTR3TestR0SimpleTest(TSTRTR0TIMER_PERIODIC_SPECIFIC, "Periodic cpu specific");
         RTR3TestR0SimpleTest(TSTRTR0TIMER_PERIODIC_OMNI, "Periodic omni timer");
@@ -82 +88 @@
      * High resolution timers.
      */
+#  ifndef RT_OS_SOLARIS // one-shot timers currently not supported on Solaris
     RTR3TestR0SimpleTest(TSTRTR0TIMER_ONE_SHOT_BASIC_HIRES, "Basic hires one shot");
+#  endif
     RTR3TestR0SimpleTest(TSTRTR0TIMER_PERIODIC_BASIC_HIRES, "Basic hires periodic");
     if (RTTestErrorCount(g_hTest) == 0)
     {
 #  if 1
+#   ifndef RT_OS_SOLARIS // one-shot timers currently not supported on Solaris
         RTR3TestR0SimpleTest(TSTRTR0TIMER_ONE_SHOT_RESTART_HIRES, "Restart hires one shot from callback");
         RTR3TestR0SimpleTest(TSTRTR0TIMER_ONE_SHOT_DESTROY_HIRES, "Destroy hires one shot from callback");
+#   endif
         RTR3TestR0SimpleTest(TSTRTR0TIMER_PERIODIC_CSSD_LOOPS_HIRES, "Create-start-stop-destroy loops, hires");
         for (uint32_t i = 0; i <= 7; i++)
             RTR3TestR0SimpleTestWithArg(TSTRTR0TIMER_PERIODIC_CHANGE_INTERVAL, i, "Change interval from callback, hires, variation %u", i);
 #  endif
+#   ifndef RT_OS_SOLARIS // one-shot timers currently not supported on Solaris
         RTR3TestR0SimpleTest(TSTRTR0TIMER_ONE_SHOT_SPECIFIC_HIRES, "One shot hires cpu specific");
+#   endif
         RTR3TestR0SimpleTest(TSTRTR0TIMER_PERIODIC_SPECIFIC_HIRES, "Periodic hires cpu specific");
         RTR3TestR0SimpleTest(TSTRTR0TIMER_PERIODIC_OMNI, "Periodic omni hires timer");