Changeset 44192 in vbox for trunk/src/VBox

Timestamp:

Dec 20, 2012 5:37:17 PM (12 years ago)

Author:

vboxsync

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

82917

Message:

r3/test.cpp: Added IPRT_TEST_OMIT_TOP_TEST env.var. for supressing the main test case name when running the unit tests from tdUnitTest1.py.

File:

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

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

@@ -124 +124 @@
     /** Set if XML output is enabled. */
     bool                fXmlEnabled;
+    /** Set if we omit the top level test in the XML report. */
+    bool                fXmlOmitTopTest;
     enum {
         kXmlPos_ValueStart,
@@ -345 +347 @@
 
                 /*
-                 * Tell the test driver that we're up.
+                 * What do we report in the XML stream/file.?
+                 */
+                pTest->fXmlOmitTopTest = RTEnvExistEx(RTENV_DEFAULT, "IPRT_TEST_OMIT_TOP_TEST");
+
+                /*
+                 * Tell the test driver that we're up to.
                  */
                 rtTestXmlStart(pTest, pszTest);
@@ -680 +687 @@
         rtTestXmlOutput(pTest, "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
         pTest->eXmlState = RTTESTINT::kXmlPos_ElementEnd;
-        rtTestXmlElemStart(pTest, "Test", "name=%RMas", pszTest);
+        if (!pTest->fXmlOmitTopTest)
+            rtTestXmlElemStart(pTest, "Test", "name=%RMas", pszTest);
     }
 }
@@ -839 +847 @@
          */
         size_t i = pTest->cXmlElements;
-        AssertReturnVoid(i > 0);
+        AssertReturnVoid(i > 0 || pTest->fXmlOmitTopTest);
         while (i-- > 1)
         {
@@ -851 +859 @@
             pTest->eXmlState = RTTESTINT::kXmlPos_ElementEnd;
         }
-        rtTestXmlElem(pTest, "End", "SubTests=\"%u\" SubTestsFailed=\"%u\" errors=\"%u\"",
-                      pTest->cSubTests, pTest->cSubTestsFailed, pTest->cErrors);
-        rtTestXmlOutput(pTest, "</Test>\n");
+
+        if (!pTest->fXmlOmitTopTest)
+        {
+            rtTestXmlElem(pTest, "End", "SubTests=\"%u\" SubTestsFailed=\"%u\" errors=\"%u\"",
+                          pTest->cSubTests, pTest->cSubTestsFailed, pTest->cErrors);
+            rtTestXmlOutput(pTest, "</Test>\n");
+        }
 
         /*