Changeset 89964 in vbox for trunk/src

Timestamp:

Jun 30, 2021 7:57:43 AM (4 years ago)

Author:

vboxsync

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

145423

Message:

Audio/ValKit: Closing fixes for audioVerifyOne(). bugref:10008

File:

• trunk/src/VBox/ValidationKit/utils/audio/vkat.cpp (modified) (1 diff)

trunk/src/VBox/ValidationKit/utils/audio/vkat.cpp

@@ -871 +871 @@
     int rc = audioVerifyOpenTestSet(pszPathSetA, &SetA);
     if (RT_SUCCESS(rc))
+    {
         rc = audioVerifyOpenTestSet(pszPathSetB, &SetB);
-
-    if (RT_SUCCESS(rc))
-    {
-        AUDIOTESTERRORDESC errDesc;
-        rc = AudioTestSetVerify(&SetA, &SetB, &errDesc);
         if (RT_SUCCESS(rc))
         {
-            RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "%RU32 errors occurred while verifying\n", AudioTestErrorDescCount(&errDesc));
-            if (AudioTestErrorDescFailed(&errDesc))
+            AUDIOTESTERRORDESC errDesc;
+            rc = AudioTestSetVerify(&SetA, &SetB, &errDesc);
+            if (RT_SUCCESS(rc))
             {
-                /** @todo Use some AudioTestErrorXXX API for enumeration here later. */
-                PAUDIOTESTERRORENTRY pErrEntry;
-                RTListForEach(&errDesc.List, pErrEntry, AUDIOTESTERRORENTRY, Node)
-                    RTTestFailed(g_hTest, pErrEntry->szDesc);
+                RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "%RU32 errors occurred while verifying\n", AudioTestErrorDescCount(&errDesc));
+                if (AudioTestErrorDescFailed(&errDesc))
+                {
+                    /** @todo Use some AudioTestErrorXXX API for enumeration here later. */
+                    PAUDIOTESTERRORENTRY pErrEntry;
+                    RTListForEach(&errDesc.List, pErrEntry, AUDIOTESTERRORENTRY, Node)
+                        RTTestFailed(g_hTest, pErrEntry->szDesc);
+                }
+                else
+                    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Verification successful\n");
+
+                AudioTestErrorDescDestroy(&errDesc);
             }
             else
-                RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Verification successful\n");
-
-            AudioTestErrorDescDestroy(&errDesc);
+                RTTestFailed(g_hTest, "Verification failed with %Rrc", rc);
+
+            if (!g_fDrvAudioDebug) /* Don't wipe stuff when debugging. Can be useful for introspecting data. */
+                AudioTestSetWipe(&SetB);
+            AudioTestSetClose(&SetB);
         }
-        else
-            RTTestFailed(g_hTest, "Verification failed with %Rrc", rc);
-    }
-
-    if (!g_fDrvAudioDebug) /* Don't wipe stuff when debugging. Can be useful for introspecting data. */
-        AudioTestSetWipe(&SetA);
-    AudioTestSetClose(&SetA);
-
-    if (!g_fDrvAudioDebug) /* Ditto. */
-        AudioTestSetWipe(&SetB);
-    AudioTestSetClose(&SetB);
+
+        if (!g_fDrvAudioDebug) /* Ditto. */
+            AudioTestSetWipe(&SetA);
+        AudioTestSetClose(&SetA);
+    }
 
     RTTestSubDone(g_hTest);