Changeset 103262 in vbox for trunk/src/VBox/Devices/VMMDev

Timestamp:

Feb 8, 2024 12:00:32 AM (13 months ago)

Author:

vboxsync

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

161553

Message:

IPRT,VMMDev,Bs3Kit: Added support for sub-sub-tests to better deal with bs3-cpu-generated-1 and others with too many sub-tests for the test manager.

File:

• trunk/src/VBox/Devices/VMMDev/VMMDevTesting.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/VMMDev/VMMDevTesting.cpp

@@ -384 +384 @@
                 case VMMDEV_TESTING_CMD_INIT:
                 case VMMDEV_TESTING_CMD_SUB_NEW:
+                case VMMDEV_TESTING_CMD_SUBSUB_NEW:
                 case VMMDEV_TESTING_CMD_FAILED:
                 case VMMDEV_TESTING_CMD_SKIPPED:
@@ -413 +414 @@
                                     if (pThisCC->hTestingTest != NIL_RTTEST)
                                         RTTestSub(pThisCC->hTestingTest, pThis->TestingData.String.sz);
+                                    break;
+                                case VMMDEV_TESTING_CMD_SUBSUB_NEW:
+                                    VMMDEV_TESTING_OUTPUT(("testing: SUBSUB_NEW  '%s'\n", pThis->TestingData.String.sz));
+                                    if (pThisCC->hTestingTest != NIL_RTTEST)
+                                        RTTestSubSub(pThisCC->hTestingTest, pThis->TestingData.String.sz);
                                     break;
                                 case VMMDEV_TESTING_CMD_FAILED:
@@ -445 +451 @@
                 case VMMDEV_TESTING_CMD_TERM:
                 case VMMDEV_TESTING_CMD_SUB_DONE:
+                case VMMDEV_TESTING_CMD_SUBSUB_DONE:
                     if (cb == 2)
                     {
@@ -469 +476 @@
 #ifdef IN_RING3
                         pThis->TestingData.Error.c = u32;
+
+                        /* Bring the error count up to the right level (a bit stupid way
+                           to do it, but it gets the job done). */
+                        if (pThisCC->hTestingTest != NIL_RTTEST)
+                        {
+                            uint32_t cShort = uCmd == VMMDEV_TESTING_CMD_TERM     ? RTTestErrorCount(pThisCC->hTestingTest)
+                                            : uCmd == VMMDEV_TESTING_CMD_SUB_DONE ? RTTestSubErrorCount(pThisCC->hTestingTest)
+                                            :                                       RTTestSubSubErrorCount(pThisCC->hTestingTest);
+                            cShort = u32 > cShort ? u32 - cShort : 0;
+                            while (cShort-- > 0)
+                                RTTestErrorInc(pThisCC->hTestingTest);
+                        }
+
                         if (uCmd == VMMDEV_TESTING_CMD_TERM)
                         {
                             if (pThisCC->hTestingTest != NIL_RTTEST)
                             {
-                                while (RTTestErrorCount(pThisCC->hTestingTest) < u32)
-                                    RTTestErrorInc(pThisCC->hTestingTest); /* A bit stupid, but does the trick. */
                                 RTTestSubDone(pThisCC->hTestingTest);
                                 RTTestSummaryAndDestroy(pThisCC->hTestingTest);
@@ -481 +499 @@
                             VMMDEV_TESTING_OUTPUT(("testing: TERM - %u errors\n", u32));
                         }
+                        else if (uCmd == VMMDEV_TESTING_CMD_SUBSUB_DONE)
+                        {
+                            if (pThisCC->hTestingTest != NIL_RTTEST)
+                                RTTestSubSubDone(pThisCC->hTestingTest);
+                            VMMDEV_TESTING_OUTPUT(("testing: SUBSUB_DONE - %u errors\n", u32));
+                        }
                         else
                         {
                             if (pThisCC->hTestingTest != NIL_RTTEST)
-                            {
-                                while (RTTestSubErrorCount(pThisCC->hTestingTest) < u32)
-                                    RTTestErrorInc(pThisCC->hTestingTest); /* A bit stupid, but does the trick. */
                                 RTTestSubDone(pThisCC->hTestingTest);
-                            }
                             VMMDEV_TESTING_OUTPUT(("testing: SUB_DONE - %u errors\n", u32));
                         }