Changeset 91036 in vbox for trunk/src/VBox

Timestamp:

Aug 31, 2021 4:27:59 PM (3 years ago)

Author:

vboxsync

Message:

Audio/Validation Kit: More code for resolving the connection problems. ​bugref:10008

File:

• trunk/src/VBox/Devices/Audio/AudioTest.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Audio/AudioTest.cpp

@@ -1124 +1124 @@
 int AudioTestSetClose(PAUDIOTESTSET pSet)
 {
-    if (!pSet)
+    AssertPtrReturn(pSet, VERR_INVALID_POINTER);
+
+    if (!audioTestManifestIsOpen(pSet))
         return VINF_SUCCESS;
 
-    if (!RTFileIsValid(pSet->f.hFile))
-        return VINF_SUCCESS;
-
     int rc;
 
-    /* Update number of bound test objects. */
-    PAUDIOTESTENTRY pTest;
-    RTListForEach(&pSet->lstTest, pTest, AUDIOTESTENTRY, Node)
-    {
-        rc = RTFileSeek(pSet->f.hFile, pTest->offObjCount, RTFILE_SEEK_BEGIN, NULL);
+    if (pSet->enmMode == AUDIOTESTSETMODE_TEST)
+    {
+        /* Update number of bound test objects. */
+        PAUDIOTESTENTRY pTest;
+        RTListForEach(&pSet->lstTest, pTest, AUDIOTESTENTRY, Node)
+        {
+            rc = RTFileSeek(pSet->f.hFile, pTest->offObjCount, RTFILE_SEEK_BEGIN, NULL);
+            AssertRCReturn(rc, rc);
+            rc = audioTestManifestWrite(pSet, "%04RU32", pTest->cObj);
+            AssertRCReturn(rc, rc);
+        }
+
+        /*
+         * Update number of ran tests.
+         */
+        rc = RTFileSeek(pSet->f.hFile, pSet->offObjCount, RTFILE_SEEK_BEGIN, NULL);
         AssertRCReturn(rc, rc);
-        rc = audioTestManifestWrite(pSet, "%04RU32", pTest->cObj);
+        rc = audioTestManifestWrite(pSet, "%04RU32", pSet->cObj);
         AssertRCReturn(rc, rc);
-    }
-
-    /*
-     * Update number of ran tests.
-     */
-    rc = RTFileSeek(pSet->f.hFile, pSet->offObjCount, RTFILE_SEEK_BEGIN, NULL);
-    AssertRCReturn(rc, rc);
-    rc = audioTestManifestWrite(pSet, "%04RU32", pSet->cObj);
-    AssertRCReturn(rc, rc);
-
-    /*
-     * Update number of ran tests.
-     */
-    rc = RTFileSeek(pSet->f.hFile, pSet->offTestCount, RTFILE_SEEK_BEGIN, NULL);
-    AssertRCReturn(rc, rc);
-    rc = audioTestManifestWrite(pSet, "%04RU32", pSet->cTests);
-    AssertRCReturn(rc, rc);
-
-    /*
-     * Serialize all registered test objects.
-     */
-    rc = RTFileSeek(pSet->f.hFile, 0, RTFILE_SEEK_END, NULL);
-    AssertRCReturn(rc, rc);
-
-    PAUDIOTESTOBJINT pObj;
-    RTListForEach(&pSet->lstObj, pObj, AUDIOTESTOBJINT, Node)
-    {
-        rc = audioTestManifestWrite(pSet, "\n");
+
+        /*
+         * Update number of ran tests.
+         */
+        rc = RTFileSeek(pSet->f.hFile, pSet->offTestCount, RTFILE_SEEK_BEGIN, NULL);
         AssertRCReturn(rc, rc);
-        char szUuid[AUDIOTEST_MAX_SEC_LEN];
-        rc = RTUuidToStr(&pObj->Uuid, szUuid, sizeof(szUuid));
+        rc = audioTestManifestWrite(pSet, "%04RU32", pSet->cTests);
         AssertRCReturn(rc, rc);
-        rc = audioTestManifestWriteSectionHdr(pSet, "obj_%s", szUuid);
+
+        /*
+         * Serialize all registered test objects.
+         */
+        rc = RTFileSeek(pSet->f.hFile, 0, RTFILE_SEEK_END, NULL);
         AssertRCReturn(rc, rc);
-        rc = audioTestManifestWrite(pSet, "obj_type=%RU32\n", pObj->enmType);
-        AssertRCReturn(rc, rc);
-        rc = audioTestManifestWrite(pSet, "obj_name=%s\n", pObj->szName);
-        AssertRCReturn(rc, rc);
-
-        switch (pObj->enmType)
+
+        PAUDIOTESTOBJINT pObj;
+        RTListForEach(&pSet->lstObj, pObj, AUDIOTESTOBJINT, Node)
         {
-            case AUDIOTESTOBJTYPE_FILE:
+            rc = audioTestManifestWrite(pSet, "\n");
+            AssertRCReturn(rc, rc);
+            char szUuid[AUDIOTEST_MAX_SEC_LEN];
+            rc = RTUuidToStr(&pObj->Uuid, szUuid, sizeof(szUuid));
+            AssertRCReturn(rc, rc);
+            rc = audioTestManifestWriteSectionHdr(pSet, "obj_%s", szUuid);
+            AssertRCReturn(rc, rc);
+            rc = audioTestManifestWrite(pSet, "obj_type=%RU32\n", pObj->enmType);
+            AssertRCReturn(rc, rc);
+            rc = audioTestManifestWrite(pSet, "obj_name=%s\n", pObj->szName);
+            AssertRCReturn(rc, rc);
+
+            switch (pObj->enmType)
             {
-                rc = audioTestManifestWrite(pSet, "obj_size=%RU64\n", pObj->File.cbSize);
-                AssertRCReturn(rc, rc);
-                break;
-            }
-
-            default:
-                AssertFailed();
-                break;
-        }
-
-        /*
-         * Write all meta data.
-         */
-        PAUDIOTESTOBJMETA pMeta;
-        RTListForEach(&pObj->lstMeta, pMeta, AUDIOTESTOBJMETA, Node)
-        {
-            switch (pMeta->enmType)
-            {
-                case AUDIOTESTOBJMETADATATYPE_STRING:
+                case AUDIOTESTOBJTYPE_FILE:
                 {
-                    rc = audioTestManifestWrite(pSet, (const char *)pMeta->pvMeta);
+                    rc = audioTestManifestWrite(pSet, "obj_size=%RU64\n", pObj->File.cbSize);
                     AssertRCReturn(rc, rc);
                     break;
@@ -1212 +1193 @@
                     break;
             }
+
+            /*
+             * Write all meta data.
+             */
+            PAUDIOTESTOBJMETA pMeta;
+            RTListForEach(&pObj->lstMeta, pMeta, AUDIOTESTOBJMETA, Node)
+            {
+                switch (pMeta->enmType)
+                {
+                    case AUDIOTESTOBJMETADATATYPE_STRING:
+                    {
+                        rc = audioTestManifestWrite(pSet, (const char *)pMeta->pvMeta);
+                        AssertRCReturn(rc, rc);
+                        break;
+                    }
+
+                    default:
+                        AssertFailed();
+                        break;
+                }
+            }
         }
-    }
-
-    RTFileClose(pSet->f.hFile);
-    pSet->f.hFile = NIL_RTFILE;
+
+        RTFileClose(pSet->f.hFile);
+        pSet->f.hFile = NIL_RTFILE;
+    }
+    else if (pSet->enmMode == AUDIOTESTSETMODE_VERIFY)
+    {
+        RTIniFileRelease(pSet->f.hIniFile);
+        pSet->f.hIniFile = NIL_RTINIFILE;
+
+        rc = VINF_SUCCESS;
+    }
+    else /* Not supported, just skip. */
+        rc = VINF_SUCCESS;
 
     return rc;
@@ -1562 +1573 @@
 int AudioTestSetPack(PAUDIOTESTSET pSet, const char *pszOutDir, char *pszFileName, size_t cbFileName)
 {
+    AssertPtrReturn(pSet, VERR_INVALID_POINTER);
     AssertReturn(!pszFileName || cbFileName, VERR_INVALID_PARAMETER);
     AssertReturn(!audioTestManifestIsOpen(pSet), VERR_WRONG_ORDER);