Changeset 44220 in vbox

Timestamp:

Jan 1, 2013 5:17:26 PM (12 years ago)

Author:

vboxsync

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

83016

Message:

tstRTTime: Renamed from tstTime, convert to RTTest and restricted the amount of output.

Location:

trunk/src/VBox/Runtime

Files:

• r3/test.cpp (modified) (2 diffs)
• testcase/Makefile.kmk (modified) (2 diffs)
• testcase/tstRTTime.cpp (moved) (moved from trunk/src/VBox/Runtime/testcase/tstTime.cpp ) (7 diffs)

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

@@ -242 +242 @@
     pTest->cchTest          = strlen(pszTest);
     pTest->cbGuard          = PAGE_SIZE * 7;
-    pTest->enmMaxLevel      = RTTESTLVL_SUB_TEST;
+    pTest->enmMaxLevel      = RTTESTLVL_INFO;
 
     pTest->pOutStrm         = g_pStdOut;
@@ -1410 +1410 @@
         case RTTESTUNIT_NS_PER_PACKET:          return "ns/packet";
         case RTTESTUNIT_NS_PER_ROUND_TRIP:      return "ns/roundtrips";
+        case RTTESTUNIT_PP1K:                   return "pp1k";
+        case RTTESTUNIT_PP10K:                  return "pp10k";
+        case RTTESTUNIT_PPM:                    return "ppm";
+        case RTTESTUNIT_PPB:                    return "ppb";
 
         /* No default so gcc helps us keep this up to date. */

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -122 +122 @@
         tstRTThreadPoke \
         tstRTThreadExecutionTime \
-        tstTime \
+        tstRTTime \
         tstTime-2 \
         tstTime-3 \
@@ -552 +552 @@
 tstRTThreadExecutionTime_SOURCES = tstRTThreadExecutionTime.cpp
 
-tstTime_TEMPLATE = VBOXR3TSTEXE
-tstTime_SOURCES = tstTime.cpp
+tstRTTime_TEMPLATE = VBOXR3TSTEXE
+tstRTTime_SOURCES = tstRTTime.cpp
 
 tstTime-2_TEMPLATE = VBOXR3TSTEXE

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT Testcase - Simple RTTime tests.
+ * IPRT Testcase - Simple RTTime tests (requires GIP).
  */
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -29 +29 @@
 *******************************************************************************/
 #include <iprt/time.h>
-#include <iprt/stream.h>
+
+#include <iprt/err.h>
 #include <iprt/initterm.h>
+#include <iprt/message.h>
+#include <iprt/test.h>
 #include <iprt/thread.h>
-#include <VBox/sup.h>
-
 
 int main()
 {
-    unsigned cErrors = 0;
-    int i;
+    /*
+     * Init.
+     */
+    int rc = RTR3InitExeNoArguments(RTR3INIT_FLAGS_SUPLIB);
+    if (RT_FAILURE(rc))
+        return RTMsgInitFailure(rc);
 
-    RTR3InitExeNoArguments(RTR3INIT_FLAGS_SUPLIB);
-    RTPrintf("tstTime: TESTING...\n");
+    RTTEST hTest;
+    rc = RTTestCreate("tstRTTime", &hTest);
+    if (RT_FAILURE(rc))
+        return RTEXITCODE_FAILURE;
+    RTTestBanner(hTest);
 
     /*
@@ -52 +60 @@
     uint64_t u64OSStartTS = RTTimeSystemNanoTS();
 
+    uint32_t i;
     uint64_t u64Prev = RTTimeNanoTS();
     for (i = 0; i < 100*_1M; i++)
@@ -59 +68 @@
         {
             /** @todo wrapping detection. */
-            RTPrintf("tstTime: error: i=%#010x u64=%#llx u64Prev=%#llx (1)\n", i, u64, u64Prev);
-            cErrors++;
+            RTTestFailed(hTest, "i=%#010x u64=%#llx u64Prev=%#llx (1)\n", i, u64, u64Prev);
+            if (RTTestErrorCount(hTest) >= 256)
+                break;
             RTThreadYield();
             u64 = RTTimeNanoTS();
@@ -66 +76 @@
         else if (u64 - u64Prev > 1000000000 /* 1sec */)
         {
-            RTPrintf("tstTime: error: i=%#010x u64=%#llx u64Prev=%#llx delta=%lld\n", i, u64, u64Prev, u64 - u64Prev);
-            cErrors++;
+            RTTestFailed(hTest, "i=%#010x u64=%#llx u64Prev=%#llx delta=%lld\n", i, u64, u64Prev, u64 - u64Prev);
+            if (RTTestErrorCount(hTest) >= 256)
+                break;
             RTThreadYield();
             u64 = RTTimeNanoTS();
@@ -73 +84 @@
         if (!(i & (_1M*2 - 1)))
         {
-            RTPrintf("tstTime: i=%#010x u64=%#llx u64Prev=%#llx delta=%lld\n", i, u64, u64Prev, u64 - u64Prev);
+            RTTestPrintf(hTest, RTTESTLVL_INFO, "i=%#010x u64=%#llx u64Prev=%#llx delta=%lld\n", i, u64, u64Prev, u64 - u64Prev);
             RTThreadYield();
             u64 = RTTimeNanoTS();
@@ -87 +98 @@
     int64_t i64Diff = u64OSElapsedTS >= u64RTElapsedTS ? u64OSElapsedTS - u64RTElapsedTS : u64RTElapsedTS - u64OSElapsedTS;
     if (i64Diff > (int64_t)(u64OSElapsedTS / 1000))
+        RTTestFailed(hTest, "total time differs too much! u64OSElapsedTS=%#llx u64RTElapsedTS=%#llx delta=%lld\n",
+                     u64OSElapsedTS, u64RTElapsedTS, u64OSElapsedTS - u64RTElapsedTS);
+    else
     {
-        RTPrintf("tstTime: error: total time differs too much! u64OSElapsedTS=%#llx u64RTElapsedTS=%#llx delta=%lld\n",
-                 u64OSElapsedTS, u64RTElapsedTS, u64OSElapsedTS - u64RTElapsedTS);
-        cErrors++;
+        RTTestValue(hTest, "Total time delta", u64OSElapsedTS - u64RTElapsedTS, RTTESTUNIT_NS);
+        RTTestPrintf(hTest, RTTESTLVL_INFO, "total time difference: u64OSElapsedTS=%#llx u64RTElapsedTS=%#llx delta=%lld\n",
+                     u64OSElapsedTS, u64RTElapsedTS, u64OSElapsedTS - u64RTElapsedTS);
     }
-    else
-        RTPrintf("tstTime: total time difference: u64OSElapsedTS=%#llx u64RTElapsedTS=%#llx delta=%lld\n",
-                 u64OSElapsedTS, u64RTElapsedTS, u64OSElapsedTS - u64RTElapsedTS);
 
 #if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86) /** @todo This isn't really x86 or AMD64 specific... */
-    RTPrintf("RTTimeDbgSteps   -> %u (%d ppt)\n", RTTimeDbgSteps(),   ((uint64_t)RTTimeDbgSteps() * 1000) / i);
-    RTPrintf("RTTimeDbgExpired -> %u (%d ppt)\n", RTTimeDbgExpired(), ((uint64_t)RTTimeDbgExpired() * 1000) / i);
-    RTPrintf("RTTimeDbgBad     -> %u (%d ppt)\n", RTTimeDbgBad(),     ((uint64_t)RTTimeDbgBad() * 1000) / i);
-    RTPrintf("RTTimeDbgRaces   -> %u (%d ppt)\n", RTTimeDbgRaces(),   ((uint64_t)RTTimeDbgRaces() * 1000) / i);
+    RTTestValue(hTest, "RTTimeDbgSteps",        RTTimeDbgSteps(),                           RTTESTUNIT_OCCURRENCES);
+    RTTestValue(hTest, "RTTimeDbgSteps pp",     ((uint64_t)RTTimeDbgSteps() * 1000) / i,    RTTESTUNIT_PP1K);
+    RTTestValue(hTest, "RTTimeDbgExpired",      RTTimeDbgExpired(),                         RTTESTUNIT_OCCURRENCES);
+    RTTestValue(hTest, "RTTimeDbgExpired pp",   ((uint64_t)RTTimeDbgExpired() * 1000) / i,  RTTESTUNIT_PP1K);
+    RTTestValue(hTest, "RTTimeDbgBad",          RTTimeDbgBad(),                             RTTESTUNIT_OCCURRENCES);
+    RTTestValue(hTest, "RTTimeDbgBad pp",       ((uint64_t)RTTimeDbgBad() * 1000) / i,      RTTESTUNIT_PP1K);
+    RTTestValue(hTest, "RTTimeDbgRaces",        RTTimeDbgRaces(),                           RTTESTUNIT_OCCURRENCES);
+    RTTestValue(hTest, "RTTimeDbgRaces pp",     ((uint64_t)RTTimeDbgRaces() * 1000) / i,    RTTESTUNIT_PP1K);
 #endif
-    if (!cErrors)
-        RTPrintf("tstTime: SUCCESS\n");
-    else
-        RTPrintf("tstTime: FAILURE - %d errors\n", cErrors);
-    return !!cErrors;
+
+    return RTTestSummaryAndDestroy(hTest);
 }