Changeset 89686 in vbox for trunk/src/VBox/ValidationKit/utils

Timestamp:

Jun 14, 2021 4:05:31 PM (4 years ago)

Author:

vboxsync

Message:

Audio/ValKit: Test and self-test modes now implicitly test the supplied test sets (unless skipped with --no-verify). ​bugref:10008

Location:

trunk/src/VBox/ValidationKit/utils/audio

Files:

• vkat.cpp (modified) (7 diffs)
• vkatInternal.h (modified) (1 diff)

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

@@ -61 +61 @@
 *********************************************************************************************************************************/
 static int audioTestCombineParms(PAUDIOTESTPARMS pBaseParms, PAUDIOTESTPARMS pOverrideParms);
+static int audioVerifyOne(const char *pszPathSetA, const char *pszPathSetB);
 
 
@@ -119 +120 @@
     VKAT_TEST_OPT_HOST_ATS_PORT,
     VKAT_TEST_OPT_MODE,
+    VKAT_TEST_OPT_NO_VERIFY,
     VKAT_TEST_OPT_OUTDIR,
     VKAT_TEST_OPT_PAUSE,
@@ -158 +160 @@
     { "--exclude",           'e',                          RTGETOPT_REQ_UINT32  },
     { "--exclude-all",       'a',                          RTGETOPT_REQ_NOTHING },
-    { "--mode",              VKAT_TEST_OPT_MODE,           RTGETOPT_REQ_STRING  },
     { "--guest-ats-address", VKAT_TEST_OPT_GUEST_ATS_ADDR, RTGETOPT_REQ_STRING  },
     { "--guest-ats-port",    VKAT_TEST_OPT_GUEST_ATS_PORT, RTGETOPT_REQ_UINT32  },
@@ -172 +173 @@
     { "--pcm-hz",            VKAT_TEST_OPT_PCM_HZ,         RTGETOPT_REQ_UINT16  },
     { "--pcm-signed",        VKAT_TEST_OPT_PCM_SIGNED,     RTGETOPT_REQ_BOOL    },
+    { "--mode",              VKAT_TEST_OPT_MODE,           RTGETOPT_REQ_STRING  },
+    { "--no-verify",         VKAT_TEST_OPT_NO_VERIFY,      RTGETOPT_REQ_NOTHING },
     { "--tag",               VKAT_TEST_OPT_TAG,            RTGETOPT_REQ_STRING  },
     { "--tempdir",           VKAT_TEST_OPT_TEMPDIR,        RTGETOPT_REQ_STRING  },
@@ -568 +571 @@
                     rc = VERR_BUFFER_OVERFLOW;
 
-                if (RT_SUCCESS(rc))
+                if (   RT_SUCCESS(rc)
+                    && !pTstEnv->fSkipVerify)
                 {
-
+                    rc = audioVerifyOne(pTstEnv->u.Host.szPathTestSetGuest, pTstEnv->u.Host.szPathTestSetValKit);
                 }
+                else
+                    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Verification skipped\n");
             }
         }
@@ -596 +602 @@
         case VKAT_TEST_OPT_HOST_ATS_PORT:  return "Port of host ATS to connect to [6052].";
         case VKAT_TEST_OPT_MODE:           return "Specifies the mode this program runs at";
+        case VKAT_TEST_OPT_NO_VERIFY:      return "Skips the verification step.";
         case 'e':                          return "Exclude the given test id from the list";
         case 'a':                          return "Exclude all tests from the list (useful to enable single tests later with --include)";
@@ -678 +685 @@
                     return RTMsgErrorExit(RTEXITCODE_SYNTAX, "Test mode (guest / host) already specified");
                 TstEnv.enmMode = RTStrICmp(ValueUnion.psz, "guest") == 0 ? AUDIOTESTMODE_GUEST : AUDIOTESTMODE_HOST;
+                break;
+
+            case VKAT_TEST_OPT_NO_VERIFY:
+                TstEnv.fSkipVerify = true;
                 break;
 

trunk/src/VBox/ValidationKit/utils/audio/vkatInternal.h

@@ -182 +182 @@
     /** Whether self test mode is active or not. */
     bool                    fSelftest;
+    /** Whether skip the actual verification or not. */
+    bool                    fSkipVerify;
     /** Output path for storing the test environment's final test files. */
     char                    szTag[AUDIOTEST_TAG_MAX];