Changeset 26604 in vbox

Timestamp:

Feb 17, 2010 12:32:58 PM (15 years ago)

Author:

vboxsync

Message:

tstSystemQueryOsInfo: converted to RTTest.

Location:

trunk/src/VBox/Runtime/testcase

Files:

• Makefile.kmk (modified) (1 diff)
• tstSystemQueryOsInfo.cpp (modified) (7 diffs)

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

@@ -408 +408 @@
 tstRTStrVersion_SOURCES = tstRTStrVersion.cpp
 
+tstSystemQueryOsInfo_TEMPLATE = VBOXR3TSTEXE
 tstSystemQueryOsInfo_SOURCES = tstSystemQueryOsInfo.cpp
 

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

@@ -33 +33 @@
 *******************************************************************************/
 #include <iprt/system.h>
-#include <iprt/initterm.h>
 #include <iprt/string.h>
-#include <iprt/stream.h>
+#include <iprt/test.h>
 
 
@@ -46 +45 @@
 int main()
 {
-    RTR3Init();
-
-    RTPrintf("tstSystemQueryOsInfo: TESTINGS...\n");
+    RTTEST hTest;
+    int rc = RTTestInitAndCreate("tstRTSystemQueryOsInfo", &hTest);
+    if (rc)
+        return rc;
+    RTTestBanner(hTest);
 
     /*
@@ -54 +55 @@
      */
     char szInfo[256];
-    int rc;
 
     rc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szInfo, sizeof(szInfo));
-    RTPrintf("tstSystemQueryOsInfo: PRODUCT: \"%s\", rc=%Rrc\n", szInfo, rc);
+    RTTestIPrintf(RTTESTLVL_ALWAYS, "PRODUCT: \"%s\", rc=%Rrc\n", szInfo, rc);
 
     rc = RTSystemQueryOSInfo(RTSYSOSINFO_RELEASE, szInfo, sizeof(szInfo));
-    RTPrintf("tstSystemQueryOsInfo: RELEASE: \"%s\", rc=%Rrc\n", szInfo, rc);
+    RTTestIPrintf(RTTESTLVL_ALWAYS, "RELEASE: \"%s\", rc=%Rrc\n", szInfo, rc);
 
     rc = RTSystemQueryOSInfo(RTSYSOSINFO_VERSION, szInfo, sizeof(szInfo));
-    RTPrintf("tstSystemQueryOsInfo: VERSION: \"%s\", rc=%Rrc\n", szInfo, rc);
+    RTTestIPrintf(RTTESTLVL_ALWAYS, "VERSION: \"%s\", rc=%Rrc\n", szInfo, rc);
 
     rc = RTSystemQueryOSInfo(RTSYSOSINFO_SERVICE_PACK, szInfo, sizeof(szInfo));
-    RTPrintf("tstSystemQueryOsInfo: SERVICE_PACK: \"%s\", rc=%Rrc\n", szInfo, rc);
+    RTTestIPrintf(RTTESTLVL_ALWAYS, "SERVICE_PACK: \"%s\", rc=%Rrc\n", szInfo, rc);
 
     /*
@@ -77 +77 @@
         if (    rc == VERR_NOT_SUPPORTED
             &&  szInfo[0] != '\0')
-        {
-            RTPrintf("tstSystemQueryOsInfo: FAILED - level=%d, rc=VERR_NOT_SUPPORTED, buffer not terminated\n", i);
-            g_cErrors++;
-        }
+            RTTestIFailed("level=%d; unterminated buffer on VERR_NOT_SUPPORTED\n", i);
+        else if (RT_SUCCESS(rc) || rc == VERR_BUFFER_OVERFLOW)
+            RTTESTI_CHECK(memchr(szInfo, '\0', sizeof(szInfo)) != NULL);
+        else if (rc != VERR_NOT_SUPPORTED)
+            RTTestIFailed("level=%d unexpected rc=%Rrc\n", i, rc);
     }
 
@@ -98 +99 @@
                 if (szInfo[off] != 0x7f)
                 {
-                    RTPrintf("tstSystemQueryOsInfo: FAILED - level=%d, rc=%Rrc, cch=%zu, off=%zu: Wrote too much!\n", i, rc, cch, off);
-                    g_cErrors++;
+                    RTTestIFailed("level=%d, rc=%Rrc, cch=%zu, off=%zu: Wrote too much!\n", i, rc, cch, off);
                     break;
                 }
@@ -111 +111 @@
             {
 
-                RTPrintf("tstSystemQueryOsInfo: FAILED - level=%d, rc=%Rrc, cch=%zu: Buffer not terminated!\n", i, rc, cch);
+                RTTestIFailed("level=%d, rc=%Rrc, cch=%zu: Buffer not terminated!\n", i, rc, cch);
                 g_cErrors++;
             }
@@ -117 +117 @@
     }
 
-    /*
-     * Summarize and exit.
-     */
-    if (!g_cErrors)
-        RTPrintf("tstSystemQueryOsInfo: SUCCESS\n");
-    else
-        RTPrintf("tstSystemQueryOsInfo: FAILED - %d errors\n", g_cErrors);
-    return !!g_cErrors;
+    return RTTestSummaryAndDestroy(hTest);
 }