Changeset 89966 in vbox

Timestamp:

Jun 30, 2021 8:24:52 AM (3 years ago)

Author:

vboxsync

Message:

Audio/ValKit: Be less strict when (binary) comparing test set audio data (comparison needs to be refined first). bugref:10008

Location:

trunk/src/VBox

Files:

• Devices/Audio/AudioTest.cpp (modified) (14 diffs)
• ValidationKit/utils/audio/vkat.cpp (modified) (1 diff)

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

@@ -522 +522 @@
 
         RTMemFree(pErrEntry);
-
-        Assert(pErr->cErrors);
-        pErr->cErrors--;
-    }
-
-    Assert(pErr->cErrors == 0);
+    }
+
+    pErr->cErrors = 0;
 }
 
@@ -577 +574 @@
         AssertFailedReturn(VERR_NO_MEMORY);
 
-    const ssize_t cch = RTStrPrintf2(pEntry->szDesc, sizeof(pEntry->szDesc), "Test #%RU32 failed: %s", idxTest, pszDescTmp);
+    const ssize_t cch = RTStrPrintf2(pEntry->szDesc, sizeof(pEntry->szDesc), "Test #%RU32 %s: %s",
+                                     idxTest, RT_FAILURE(rc) ? "failed" : "info", pszDescTmp);
     RTStrFree(pszDescTmp);
     AssertReturn(cch > 0, VERR_BUFFER_OVERFLOW);
@@ -585 +583 @@
     RTListAppend(&pErr->List, &pEntry->Node);
 
-    pErr->cErrors++;
+    if (RT_FAILURE(rc))
+        pErr->cErrors++;
 
     return VINF_SUCCESS;
@@ -591 +590 @@
 
 /**
- * Adds a single error entry to an audio test error description, va_list version.
+ * Adds a single error entry to an audio test error description.
  *
  * @returns VBox status code.
@@ -599 +598 @@
  * @param   ...                 Optional format arguments of \a pszDesc to add.
  */
-static int audioTestErrorDescAdd(PAUDIOTESTERRORDESC pErr, uint32_t idxTest, const char *pszFormat, ...)
+static int audioTestErrorDescAddError(PAUDIOTESTERRORDESC pErr, uint32_t idxTest, const char *pszFormat, ...)
 {
     va_list va;
@@ -605 +604 @@
 
     int rc = audioTestErrorDescAddV(pErr, idxTest, VERR_GENERAL_FAILURE /** @todo Fudge! */, pszFormat, va);
+
+    va_end(va);
+    return rc;
+}
+
+/**
+ * Adds a single info entry to an audio test error description, va_list version.
+ *
+ * @returns VBox status code.
+ * @param   pErr                Test error description to add entry for.
+ * @param   idxTest             Index of failing test (zero-based).
+ * @param   pszFormat           Error description format string to add.
+ * @param   ...                 Optional format arguments of \a pszDesc to add.
+ */
+static int audioTestErrorDescAddInfo(PAUDIOTESTERRORDESC pErr, uint32_t idxTest, const char *pszFormat, ...)
+{
+    va_list va;
+    va_start(va, pszFormat);
+
+    int rc = audioTestErrorDescAddV(pErr, idxTest, VINF_SUCCESS, pszFormat, va);
 
     va_end(va);
@@ -1648 +1667 @@
     if (RT_FAILURE(a_rc)) \
     { \
-        int rc3 = audioTestErrorDescAdd(a_pVerJob->pErr, a_pVerJob->idxTest, a_Msg); \
+        int rc3 = audioTestErrorDescAddError(a_pVerJob->pErr, a_pVerJob->idxTest, a_Msg); \
         AssertRC(rc3); \
         if (!a_pVerJob->fKeepGoing) \
@@ -1657 +1676 @@
     if (RT_FAILURE(a_rc)) \
     { \
-        int rc3 = audioTestErrorDescAdd(a_pVerJob->pErr, a_pVerJob->idxTest, a_Msg, __VA_ARGS__); \
+        int rc3 = audioTestErrorDescAddError(a_pVerJob->pErr, a_pVerJob->idxTest, a_Msg, __VA_ARGS__); \
         AssertRC(rc3); \
         if (!a_pVerJob->fKeepGoing) \
@@ -1701 +1720 @@
     if (!cbSizeA)
     {
-        int rc2 = audioTestErrorDescAdd(pVerJob->pErr, pVerJob->idxTest, "File '%s' is empty\n", pObjA->szName);
+        int rc2 = audioTestErrorDescAddError(pVerJob->pErr, pVerJob->idxTest, "File '%s' is empty", pObjA->szName);
         AssertRC(rc2);
     }
@@ -1707 +1726 @@
     if (!cbSizeB)
     {
-        int rc2 = audioTestErrorDescAdd(pVerJob->pErr, pVerJob->idxTest, "File '%s' is empty\n", pObjB->szName);
+        int rc2 = audioTestErrorDescAddError(pVerJob->pErr, pVerJob->idxTest, "File '%s' is empty", pObjB->szName);
         AssertRC(rc2);
     }
@@ -1713 +1732 @@
     if (cbSizeA != cbSizeB)
     {
-        int rc2 = audioTestErrorDescAdd(pVerJob->pErr, pVerJob->idxTest, "File '%s' is %zu bytes %s than '%s'\n",
-                                        pObjA->szName,
-                                        cbSizeA > cbSizeB ? cbSizeA - cbSizeB : cbSizeB - cbSizeA,
-                                        cbSizeA > cbSizeB ? "bigger" : "smaller",
-                                        pObjB->szName);
+        int rc2 = audioTestErrorDescAddInfo(pVerJob->pErr, pVerJob->idxTest, "File '%s' is %zu bytes %s than '%s'",
+                                            pObjA->szName,
+                                            cbSizeA > cbSizeB ? cbSizeA - cbSizeB : cbSizeB - cbSizeA,
+                                            cbSizeA > cbSizeB ? "bigger" : "smaller",
+                                            pObjB->szName);
         AssertRC(rc2);
     }
-    else if (audioTestFilesCompareBinary(pObjA->File.hFile, pObjB->File.hFile, cbSizeA))
+
+    if (!audioTestFilesCompareBinary(pObjA->File.hFile, pObjB->File.hFile, cbSizeA))
     {
         /** @todo Add more sophisticated stuff here. */
 
-        int rc2 = audioTestErrorDescAdd(pVerJob->pErr, pVerJob->idxTest, "Files '%s' and '%s' have different content\n",
-                                        pObjA->szName, pObjB->szName);
+        int rc2 = audioTestErrorDescAddInfo(pVerJob->pErr, pVerJob->idxTest, "Files '%s' and '%s' have different content",
+                                            pObjA->szName, pObjB->szName);
         AssertRC(rc2);
     }
@@ -1787 +1807 @@
     if (RT_FAILURE(rc))
     {
-       int rc2 = audioTestErrorDescAdd(pVerify->pErr, pVerify->idxTest, "Verififcation of test tone data failed\n");
+       int rc2 = audioTestErrorDescAddError(pVerify->pErr, pVerify->idxTest, "Verififcation of test tone data failed\n");
        AssertRC(rc2);
     }
@@ -1870 +1890 @@
                     rc = audioTestVerifyTestTone(&VerJob, &hTest, VerJob.pSetA, VerJob.pSetB);
                 else
-                    rc = audioTestErrorDescAdd(pErrDesc, i, "Playback test types don't match (set A=%#x, set B=%#x)",
-                                               enmTestTypeA, enmTestTypeB);
+                    rc = audioTestErrorDescAddError(pErrDesc, i, "Playback test types don't match (set A=%#x, set B=%#x)",
+                                                    enmTestTypeA, enmTestTypeB);
                 break;
             }
@@ -1880 +1900 @@
                     rc = audioTestVerifyTestTone(&VerJob, &hTest, VerJob.pSetB, VerJob.pSetA);
                 else
-                    rc = audioTestErrorDescAdd(pErrDesc, i, "Recording test types don't match (set A=%#x, set B=%#x)",
-                                               enmTestTypeA, enmTestTypeB);
+                    rc = audioTestErrorDescAddError(pErrDesc, i, "Recording test types don't match (set A=%#x, set B=%#x)",
+                                                    enmTestTypeA, enmTestTypeB);
                 break;
             }

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

@@ -879 +879 @@
             if (RT_SUCCESS(rc))
             {
-                RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "%RU32 errors occurred while verifying\n", AudioTestErrorDescCount(&errDesc));
-                if (AudioTestErrorDescFailed(&errDesc))
+                uint32_t const cErr = AudioTestErrorDescCount(&errDesc);
+                RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "%RU32 errors occurred while verifying\n", cErr);
+
+                /** @todo Use some AudioTestErrorXXX API for enumeration here later. */
+                PAUDIOTESTERRORENTRY pErrEntry;
+                RTListForEach(&errDesc.List, pErrEntry, AUDIOTESTERRORENTRY, Node)
                 {
-                    /** @todo Use some AudioTestErrorXXX API for enumeration here later. */
-                    PAUDIOTESTERRORENTRY pErrEntry;
-                    RTListForEach(&errDesc.List, pErrEntry, AUDIOTESTERRORENTRY, Node)
-                        RTTestFailed(g_hTest, pErrEntry->szDesc);
+                    if (RT_FAILURE(pErrEntry->rc))
+                        RTTestFailed(g_hTest, "%s\n", pErrEntry->szDesc);
+                    else
+                        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "%s\n", pErrEntry->szDesc);
                 }
-                else
+
+                if (cErr == 0)
                     RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Verification successful\n");