Changeset 44140 in vbox

Timestamp:

Dec 16, 2012 5:45:11 PM (12 years ago)

Author:

vboxsync

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

82767

Message:

IPRT/r3/test.cpp: No element values, only attribute values. Simplifies parsing.

File:

• trunk/src/VBox/Runtime/r3/test.cpp (modified) (6 diffs)

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

@@ -186 +186 @@
 static void rtTestXmlElemStartV(PRTTESTINT pTest, const char *pszTag, const char *pszAttrFmt, va_list va);
 static void rtTestXmlElemStart(PRTTESTINT pTest, const char *pszTag, const char *pszAttrFmt, ...);
-static void rtTestXmlElemValueV(PRTTESTINT pTest, const char *pszFormat, va_list va);
-static void rtTestXmlElemValue(PRTTESTINT pTest, const char *pszFormat, ...);
 static void rtTestXmlElemEnd(PRTTESTINT pTest, const char *pszTag);
 static void rtTestXmlEnd(PRTTESTINT pTest);
@@ -794 +792 @@
 
 /**
- * Writes an element value, or a part of one, taking care of all the escaping.
- *
- * The caller must own the instance lock.
- *
- * @param   pTest               The test instance.
- * @param   pszFormat           The value format string.
- * @param   va                  The format arguments.
- */
-static void rtTestXmlElemValueV(PRTTESTINT pTest, const char *pszFormat, va_list va)
-{
-    if (pTest->fXmlEnabled)
-    {
-        char *pszValue;
-        RTStrAPrintfV(&pszValue, pszFormat, va);
-        if (pszValue)
-        {
-            rtTestXmlOutput(pTest, "%RMes", pszValue);
-            RTStrFree(pszValue);
-        }
-        pTest->eXmlState = RTTESTINT::kXmlPos_Value;
-    }
-}
-
-
-/**
- * Wrapper around rtTestXmlElemValueV.
- */
-static void rtTestXmlElemValue(PRTTESTINT pTest, const char *pszFormat, ...)
-{
-    va_list va;
-    va_start(va, pszFormat);
-    rtTestXmlElemValueV(pTest, pszFormat, va);
-    va_end(va);
-}
-
-
-/**
  * Ends the current element.
  *
@@ -1130 +1091 @@
         {
             rtTestXmlElem(pTest, "Passed", NULL);
-            rtTestXmlElemEnd(pTest, "SubTest");
+            rtTestXmlElemEnd(pTest, "Test");
             cch += RTTestPrintfNl(pTest, RTTESTLVL_SUB_TEST, "%-50s: PASSED\n", pTest->pszSubTest);
         }
@@ -1137 +1098 @@
             pTest->cSubTestsFailed++;
             rtTestXmlElem(pTest, "Failed", "errors=\"%u\"", cErrors);
-            rtTestXmlElemEnd(pTest, "SubTest");
+            rtTestXmlElemEnd(pTest, "Test");
             cch += RTTestPrintfNl(pTest, RTTESTLVL_SUB_TEST, "%-50s: FAILED (%u errors)\n",
                                   pTest->pszSubTest, cErrors);
@@ -1272 +1233 @@
         cch = RTTestPrintfNl(hTest, RTTESTLVL_DEBUG, "debug: Starting sub-test '%s'\n", pszSubTest);
 
-    rtTestXmlElemStart(pTest, "SubTest", "name=%RMas", pszSubTest);
+    rtTestXmlElemStart(pTest, "Test", "name=%RMas", pszSubTest);
 
     RTCritSectLeave(&pTest->Lock);
@@ -1456 +1417 @@
 
     RTCritSectEnter(&pTest->Lock);
-    rtTestXmlElemStart(pTest, "Value", "name=%RMas unit=%RMas", pszName, pszUnit);
-    rtTestXmlElemValue(pTest, "%llu", u64Value);
-    rtTestXmlElemEnd(pTest, "Value");
+    rtTestXmlElem(pTest, "Value", "name=%RMas unit=%RMas value=\"%llu\"", pszName, pszUnit, u64Value);
     RTCritSectLeave(&pTest->Lock);