Changeset 46333 in vbox

Timestamp:

May 30, 2013 5:27:55 PM (12 years ago)

Author:

vboxsync

Message:

rtTestXmlStart: fix.

File:

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

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

@@ -775 +775 @@
         rtTestXmlOutput(pTest, "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
         pTest->eXmlState = RTTESTINT::kXmlPos_ElementEnd;
-        if (!(pTest->fFlags & RTTEST_C_XML_DELAY_TOP_TEST))
-        {
-            pTest->fXmlTopTestDone = true;
-            if (!pTest->fXmlOmitTopTest)
-                rtTestXmlElemStart(pTest, "Test", "name=%RMas", pszTest);
-        }
+        pTest->fXmlTopTestDone = !(pTest->fFlags & RTTEST_C_XML_DELAY_TOP_TEST) || pTest->fXmlOmitTopTest;
+        if (pTest->fXmlTopTestDone && !pTest->fXmlOmitTopTest)
+            rtTestXmlElemStart(pTest, "Test", "name=%RMas", pszTest);
     }
 }
@@ -939 +936 @@
          */
         size_t i = pTest->cXmlElements;
-        AssertReturnVoid(i > 0 || pTest->fXmlOmitTopTest);
+        AssertReturnVoid(i > 0 || pTest->fXmlOmitTopTest || !pTest->fXmlTopTestDone);
         while (i-- > 1)
         {