Changeset 91136 in vbox

Timestamp:

Sep 7, 2021 8:03:55 AM (3 years ago)

Author:

vboxsync

Message:

Audio/Validation Kit: Added more tweakable options for the audio test set verification and also let the test driver pass through those to VKAT when specified [build fix, forgot a file]. ​bugref:10008

File:

• trunk/src/VBox/ValidationKit/utils/audio/vkat.cpp (modified) (9 diffs)

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

@@ -63 +63 @@
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
-static int audioVerifyOne(const char *pszPathSetA, const char *pszPathSetB);
+static int audioVerifyOne(const char *pszPathSetA, const char *pszPathSetB, PAUDIOTESTVERIFYOPTS pOpts);
 
 
@@ -146 +146 @@
 enum
 {
-    VKAT_VERIFY_OPT_TAG = 900
+    VKAT_VERIFY_OPT_MAX_DIFF_COUNT = 900,
+    VKAT_VERIFY_OPT_MAX_DIFF_PERCENT,
+    VKAT_VERIFY_OPT_MAX_SIZE_PERCENT
 };
 
@@ -201 +203 @@
 static const RTGETOPTDEF g_aCmdVerifyOptions[] =
 {
-    { "--tag",              VKAT_VERIFY_OPT_TAG,                RTGETOPT_REQ_STRING  }
+    { "--max-diff-count",      VKAT_VERIFY_OPT_MAX_DIFF_COUNT,     RTGETOPT_REQ_UINT32 },
+    { "--max-diff-percent",    VKAT_VERIFY_OPT_MAX_DIFF_PERCENT,   RTGETOPT_REQ_UINT8  },
+    { "--max-size-percent",    VKAT_VERIFY_OPT_MAX_SIZE_PERCENT,   RTGETOPT_REQ_UINT8  }
 };
 
@@ -665 +669 @@
                     && !pTstEnv->fSkipVerify)
                 {
-                    rc = audioVerifyOne(pTstEnv->u.Host.szPathTestSetGuest, pTstEnv->u.Host.szPathTestSetValKit);
+                    rc = audioVerifyOne(pTstEnv->u.Host.szPathTestSetGuest, pTstEnv->u.Host.szPathTestSetValKit, NULL /* pOpts */);
                 }
                 else
@@ -1038 +1042 @@
  * @param   pszPathSetA         Absolute path to test set A.
  * @param   pszPathSetB         Absolute path to test set B.
- */
-static int audioVerifyOne(const char *pszPathSetA, const char *pszPathSetB)
+ * @param   pOpts               Verification options to use. Optional.
+ *                              When NULL, the (very strict) defaults will be used.
+ */
+static int audioVerifyOne(const char *pszPathSetA, const char *pszPathSetB, PAUDIOTESTVERIFYOPTS pOpts)
 {
     RTTestSubF(g_hTest, "Verifying");
@@ -1052 +1058 @@
         {
             AUDIOTESTERRORDESC errDesc;
-            rc = AudioTestSetVerify(&SetA, &SetB, &errDesc);
+            if (pOpts)
+                rc = AudioTestSetVerifyEx(&SetA, &SetB, pOpts, &errDesc);
+            else
+                rc = AudioTestSetVerify(&SetA, &SetB, &errDesc);
             if (RT_SUCCESS(rc))
             {
@@ -1113 +1122 @@
     unsigned    iTestSet    = 0;
 
+    AUDIOTESTVERIFYOPTS Opts;
+    AudioTestSetVerifyOptsInitStrict(&Opts);
+
     int           ch;
     RTGETOPTUNION ValueUnion;
@@ -1119 +1131 @@
         switch (ch)
         {
-            case VKAT_VERIFY_OPT_TAG:
+            case VKAT_VERIFY_OPT_MAX_DIFF_COUNT:
+                Opts.cMaxDiff = ValueUnion.u32;
+                break;
+
+            case VKAT_VERIFY_OPT_MAX_DIFF_PERCENT:
+                Opts.uMaxDiffPercent = ValueUnion.u8;
+                break;
+
+            case VKAT_VERIFY_OPT_MAX_SIZE_PERCENT:
+                Opts.uMaxSizePercent = ValueUnion.u8;
                 break;
 
@@ -1157 +1178 @@
 
     if (RT_SUCCESS(rc))
-        audioVerifyOne(apszSets[0], apszSets[1]);
+        audioVerifyOne(apszSets[0], apszSets[1], &Opts);
 
     /*