Changeset 89051 in vbox for trunk

Timestamp:

May 14, 2021 6:58:11 PM (4 years ago)

Author:

vboxsync

Message:

Audio/ValKit: More code for VKAT audio test set generation; initial implementation now can pack up tests sets as .tar.gz files. bugref:10008

Location:

trunk/src/VBox

Files:

• Devices/Audio/AudioTest.cpp (modified) (13 diffs)
• Devices/Audio/AudioTest.h (modified) (8 diffs)
• Devices/Audio/DrvHostAudioDebug.cpp (modified) (1 diff)
• ValidationKit/utils/audio/vkat.cpp (modified) (16 diffs)

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

@@ -34 +34 @@
 #include <iprt/uuid.h>
 #include <iprt/vfs.h>
+#include <iprt/zip.h>
 
 #define _USE_MATH_DEFINES
@@ -110 +111 @@
  * @param   pcbWritten          How many bytes were written on success.
  */
-int AudioTestToneWrite(PAUDIOTESTTONE pTone, void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
+int AudioTestToneGenerate(PAUDIOTESTTONE pTone, void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
 {
     /*
-     * Clear the buffer first so we don't need to thing about additional channels.
+     * Clear the buffer first so we don't need to think about additional channels.
      */
-    uint32_t cFrames = PDMAudioPropsBytesToFrames(&pTone->Props, cbBuf);
+    uint32_t cFrames   = PDMAudioPropsBytesToFrames(&pTone->Props, cbBuf);
+
+    /* Input cbBuf not necessarily is aligned to the frames, so re-calculate it. */
+    const uint32_t cbToWrite = PDMAudioPropsFramesToBytes(&pTone->Props, cFrames);
+
     PDMAudioPropsClearBuffer(&pTone->Props, pvBuf, cbBuf, cFrames);
 
@@ -206 +211 @@
 
     if (pcbWritten)
-        *pcbWritten = PDMAudioPropsFramesToBytes(&pTone->Props, cFrames);
+        *pcbWritten = cbToWrite;
 
     return VINF_SUCCESS;
@@ -225 +230 @@
 
     pToneParams->msPrequel      = RTRandU32Ex(0, RT_MS_5SEC);
+#ifdef DEBUG_andy
+    pToneParams->msDuration     = RTRandU32Ex(0, RT_MS_1SEC);
+#else
     pToneParams->msDuration     = RTRandU32Ex(0, RT_MS_10SEC); /** @todo Probably a bit too long, but let's see. */
+#endif
     pToneParams->msSequel       = RTRandU32Ex(0, RT_MS_5SEC);
     pToneParams->uVolumePercent = RTRandU32Ex(0, 100);
@@ -246 +255 @@
 int AudioTestPathCreate(char *pszPath, size_t cbPath, const char *pszTag)
 {
+    AssertReturn(strlen(pszTag) <= AUDIOTEST_TAG_MAX, VERR_INVALID_PARAMETER);
+
     int rc;
 
@@ -263 +274 @@
     }
 
-    char szName[128];
-    if (RTStrPrintf2(szName, sizeof(szName), "%s%s", AUDIOTEST_PATH_PREFIX_STR, szTag) < 0)
+    char szName[RT_ELEMENTS(AUDIOTEST_PATH_PREFIX_STR) + AUDIOTEST_TAG_MAX + 4];
+    if (RTStrPrintf2(szName, sizeof(szName), "%s-%s", AUDIOTEST_PATH_PREFIX_STR, szTag) < 0)
         AssertFailedReturn(VERR_BUFFER_OVERFLOW);
 
@@ -365 +376 @@
 {
     pSet->f.hFile = NIL_RTFILE;
+
+    RTListInit(&pSet->lstObj);
 }
 
@@ -510 +523 @@
 int AudioTestPathCreateTemp(char *pszPath, size_t cbPath, const char *pszTag)
 {
+    AssertReturn(strlen(pszTag) <= AUDIOTEST_TAG_MAX, VERR_INVALID_PARAMETER);
+
     char szPath[RTPATH_MAX];
 
@@ -531 +546 @@
 int AudioTestSetCreate(PAUDIOTESTSET pSet, const char *pszPath, const char *pszTag)
 {
+    AssertReturn(strlen(pszTag) <= AUDIOTEST_TAG_MAX, VERR_INVALID_PARAMETER);
+
     int rc;
 
@@ -596 +613 @@
 
         pSet->enmMode = AUDIOTESTSETMODE_TEST;
+
+        rc = RTStrCopy(pSet->szTag, sizeof(pSet->szTag), pszTag);
+        AssertRCReturn(rc, rc);
     }
 
@@ -604 +624 @@
  * Destroys a test set.
  *
+ * @returns VBox status code.
  * @param   pSet                Test set to destroy.
  */
-void AudioTestSetDestroy(PAUDIOTESTSET pSet)
+int AudioTestSetDestroy(PAUDIOTESTSET pSet)
 {
     if (!pSet)
-        return;
+        return VINF_SUCCESS;
+
+    int rc = VINF_SUCCESS;
+
+    PAUDIOTESTOBJ pObj, pObjNext;
+    RTListForEachSafe(&pSet->lstObj, pObj, pObjNext, AUDIOTESTOBJ, Node)
+    {
+        rc = AudioTestSetObjClose(pObj);
+        if (RT_SUCCESS(rc))
+        {
+            RTListNodeRemove(&pObj->Node);
+            RTMemFree(pObj);
+
+            Assert(pSet->cObj);
+            pSet->cObj--;
+        }
+        else
+            break;
+    }
+
+    if (RT_FAILURE(rc))
+        return rc;
+
+    Assert(pSet->cObj == 0);
 
     if (RTFileIsValid(pSet->f.hFile))
@@ -616 +660 @@
         pSet->f.hFile = NIL_RTFILE;
     }
+
+    return rc;
 }
 
@@ -661 +707 @@
 
 /**
+ * Physically wipes all related test set files off the disk.
+ *
+ * @param   pSet                Test set to wipe.
+ */
+void AudioTestSetWipe(PAUDIOTESTSET pSet)
+{
+    RT_NOREF(pSet);
+}
+
+/**
+ * Creates and registers a new audio test object to a test set.
+ *
+ * @returns VBox status code.
+ * @param   pSet                Test set to create and register new object for.
+ * @param   pszName             Name of new object to create.
+ * @param   ppObj               Where to return the pointer to the newly created object on success.
+ */
+int AudioTestSetObjCreateAndRegister(PAUDIOTESTSET pSet, const char *pszName, PAUDIOTESTOBJ *ppObj)
+{
+    AssertPtrReturn(pszName, VERR_INVALID_POINTER);
+
+    PAUDIOTESTOBJ pObj = (PAUDIOTESTOBJ)RTMemAlloc(sizeof(AUDIOTESTOBJ));
+    AssertPtrReturn(pObj, VERR_NO_MEMORY);
+
+    int rc = RTStrPrintf(pObj->szName, sizeof(pObj->szName), "%04RU32-%s", pSet->cObj, pszName);
+    AssertRCReturn(rc, rc);
+
+    /** @todo Generalize this function more once we have more object types. */
+
+    char szFilePath[RTPATH_MAX];
+    rc = RTPathJoin(szFilePath, sizeof(szFilePath), pSet->szPathAbs, pObj->szName);
+    AssertRCReturn(rc, rc);
+
+    rc = RTFileOpen(&pObj->File.hFile, szFilePath, RTFILE_O_CREATE | RTFILE_O_WRITE | RTFILE_O_DENY_WRITE);
+    if (RT_SUCCESS(rc))
+    {
+        pObj->enmType = AUDIOTESTOBJTYPE_FILE;
+
+        RTListAppend(&pSet->lstObj, &pObj->Node);
+        pSet->cObj++;
+
+        *ppObj = pObj;
+    }
+
+    if (RT_FAILURE(rc))
+        RTMemFree(pObj);
+
+    return rc;
+}
+
+/**
+ * Writes to a created audio test object.
+ *
+ * @returns VBox status code.
+ * @param   pObj                Audio test object to write to.
+ */
+int AudioTestSetObjWrite(PAUDIOTESTOBJ pObj, void *pvBuf, size_t cbBuf)
+{
+    /** @todo Generalize this function more once we have more object types. */
+    AssertReturn(pObj->enmType == AUDIOTESTOBJTYPE_FILE, VERR_INVALID_PARAMETER);
+
+    return RTFileWrite(pObj->File.hFile, pvBuf, cbBuf, NULL);
+}
+
+/**
+ * Closes an opened audio test object.
+ *
+ * @returns VBox status code.
+ * @param   pObj                Audio test object to close.
+ */
+int AudioTestSetObjClose(PAUDIOTESTOBJ pObj)
+{
+    if (!pObj)
+        return VINF_SUCCESS;
+
+    /** @todo Generalize this function more once we have more object types. */
+    AssertReturn(pObj->enmType == AUDIOTESTOBJTYPE_FILE, VERR_INVALID_PARAMETER);
+
+    int rc = VINF_SUCCESS;
+
+    if (RTFileIsValid(pObj->File.hFile))
+    {
+        rc = RTFileClose(pObj->File.hFile);
+        pObj->File.hFile = NIL_RTFILE;
+    }
+
+    return rc;
+}
+
+/**
  * Packs an audio test so that it's ready for transmission.
  *
  * @returns VBox status code.
  * @param   pSet                Test set to pack.
- * @param   pszOutDir           Where to store the packed test set.
- */
-int AudioTestSetPack(PAUDIOTESTSET pSet, const char *pszOutDir)
-{
-    RT_NOREF(pSet, pszOutDir);
-
+ * @param   pszOutDir           Directory where to store the packed test set.
+ * @param   pszFileName         Where to return the final name of the packed test set. Optional and can be NULL.
+ * @param   cbFileName          Size (in bytes) of \a pszFileName.
+ */
+int AudioTestSetPack(PAUDIOTESTSET pSet, const char *pszOutDir, char *pszFileName, size_t cbFileName)
+{
+    AssertReturn(!pszFileName || cbFileName, VERR_INVALID_PARAMETER);
     AssertReturn(audioTestManifestIsOpen(pSet), VERR_WRONG_ORDER);
-    // RTZipTarCmd()
-
-    return VERR_NOT_IMPLEMENTED;
+
+    /** @todo Check and deny if \a pszOutDir is part of the set's path. */
+
+    char szOutName[RT_ELEMENTS(AUDIOTEST_PATH_PREFIX_STR) + AUDIOTEST_TAG_MAX + 16];
+    int rc = RTStrPrintf(szOutName, sizeof(szOutName), "%s-%s.tar.gz", AUDIOTEST_PATH_PREFIX_STR, pSet->szTag);
+    AssertRCReturn(rc, rc);
+
+    char szOutPath[RTPATH_MAX];
+    rc = RTPathJoin(szOutPath, sizeof(szOutPath), pszOutDir, szOutName);
+    AssertRCReturn(rc, rc);
+
+    const char *apszArgs[10];
+    unsigned    cArgs = 0;
+
+    apszArgs[cArgs++] = "AudioTest";
+    apszArgs[cArgs++] = "--create";
+    apszArgs[cArgs++] = "--gzip";
+    apszArgs[cArgs++] = "--directory";
+    apszArgs[cArgs++] = pSet->szPathAbs;
+    apszArgs[cArgs++] = "--file";
+    apszArgs[cArgs++] = szOutPath;
+    apszArgs[cArgs++] = ".";
+
+    RTEXITCODE rcExit = RTZipTarCmd(cArgs, (char **)apszArgs);
+    if (rcExit != RTEXITCODE_SUCCESS)
+        rc = VERR_GENERAL_FAILURE; /** @todo Fudge! */
+
+    if (RT_SUCCESS(rc))
+    {
+        if (pszFileName)
+            rc = RTStrCopy(pszFileName, cbFileName, szOutPath);
+    }
+
+    return rc;
 }
 

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

@@ -24 +24 @@
 #endif
 
+/** @todo Some stuff here can be private-only to the implementation. */
+
+/** Maximum length in characters an audio test tag can have. */
+#define AUDIOTEST_TAG_MAX          64
+/** Maximum length in characters a single audio test error description can have. */
+#define AUDIOTEST_ERROR_DESC_MAX   128
 /** Prefix for audio test (set) directories. */
-#define AUDIOTEST_PATH_PREFIX_STR "audio-test-"
+#define AUDIOTEST_PATH_PREFIX_STR "vkat"
 
 /**
@@ -131 +137 @@
 typedef struct AUDIOTESTPARMS
 {
-    /** Specifies the test to run. */
-    uint32_t                idxTest;
+    /** Specifies the current test iteration. */
+    uint32_t                idxCurrent;
     /** How many iterations the test should be executed. */
     uint32_t                cIterations;
@@ -152 +158 @@
 typedef AUDIOTESTPARMS *PAUDIOTESTPARMS;
 
+typedef enum AUDIOTESTOBJTYPE
+{
+    AUDIOTESTOBJTYPE_UNKNOWN = 0,
+    AUDIOTESTOBJTYPE_FILE,
+    /** The usual 32-bit hack. */
+    AUDIOTESTOBJTYPE_32BIT_HACK = 0x7fffffff
+} AUDIOTESTOBJTYPE;
+
+typedef struct AUDIOTESTOBJFILE
+{
+    RTFILE hFile;
+} AUDIOTESTOBJFILE;
+
+typedef struct AUDIOTESTOBJ
+{
+    RTLISTNODE           Node;
+    char                 szName[64];
+    AUDIOTESTOBJTYPE     enmType;
+    union
+    {
+        AUDIOTESTOBJFILE File;
+    };
+} AUDIOTESTOBJ;
+/** Pointer to an audio test object. */
+typedef AUDIOTESTOBJ *PAUDIOTESTOBJ;
+
 /**
  * Structure specifying an audio test set.
@@ -157 +189 @@
 typedef struct AUDIOTESTSET
 {
+    /** The set's tag. */
+    char             szTag[AUDIOTEST_TAG_MAX];
     /** Absolute path where to store the test audio data. */
     char             szPathAbs[RTPATH_MAX];
@@ -166 +200 @@
         RTINIFILE    hIniFile;
     } f;
+    uint32_t         cObj;
+    RTLISTANCHOR     lstObj;
 } AUDIOTESTSET;
 /** Pointer to an audio test set. */
@@ -180 +216 @@
     int              rc;
     /** Actual error description. */
-    char             szDesc[128];
+    char             szDesc[AUDIOTEST_ERROR_DESC_MAX];
 } AUDIOTESTERRORENTRY;
 /** Pointer to an audio test error description. */
@@ -201 +237 @@
 
 double AudioTestToneInitRandom(PAUDIOTESTTONE pTone, PPDMAUDIOPCMPROPS pProps);
-int    AudioTestToneWrite(PAUDIOTESTTONE pTone, void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten);
+int    AudioTestToneGenerate(PAUDIOTESTTONE pTone, void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten);
 
 int    AudioTestToneParamsInitRandom(PAUDIOTESTTONEPARMS pToneParams, PPDMAUDIOPCMPROPS pProps);
@@ -208 +244 @@
 int    AudioTestPathCreate(char *pszPath, size_t cbPath, const char *pszUUID);
 
+int    AudioTestSetObjCreateAndRegister(PAUDIOTESTSET pSet, const char *pszName, PAUDIOTESTOBJ *ppObj);
+int    AudioTestSetObjWrite(PAUDIOTESTOBJ pObj, void *pvBuf, size_t cbBuf);
+int    AudioTestSetObjClose(PAUDIOTESTOBJ pObj);
+
 int    AudioTestSetCreate(PAUDIOTESTSET pSet, const char *pszPath, const char *pszTag);
-void   AudioTestSetDestroy(PAUDIOTESTSET pSet);
+int    AudioTestSetDestroy(PAUDIOTESTSET pSet);
 int    AudioTestSetOpen(PAUDIOTESTSET pSet, const char *pszPath);
 void   AudioTestSetClose(PAUDIOTESTSET pSet);
-int    AudioTestSetPack(PAUDIOTESTSET pSet, const char *pszOutDir);
+void   AudioTestSetWipe(PAUDIOTESTSET pSet);
+int    AudioTestSetPack(PAUDIOTESTSET pSet, const char *pszOutDir, char *pszFileName, size_t cbFileName);
 int    AudioTestSetUnpack(const char *pszFile, const char *pszOutDir);
 int    AudioTestSetVerify(PAUDIOTESTSET pSet, const char *pszTag, PAUDIOTESTERRORDESC pErrDesc);

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

@@ -264 +264 @@
 
     uint32_t cbWritten;
-    int rc = AudioTestToneWrite(&pStreamDbg->In, pvBuf, cbBuf, &cbWritten);
+    int rc = AudioTestToneGenerate(&pStreamDbg->In, pvBuf, cbBuf, &cbWritten);
     if (RT_SUCCESS(rc))
     {

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

@@ -100 +100 @@
 typedef struct AUDIOTESTENV
 {
+    /** Output path for storing the test environment's final test files. */
+    char                  szPathOut[RTPATH_MAX];
+    /** Temporary path for this test environment. */
+    char                  szPathTemp[RTPATH_MAX];
     /** The host (backend) driver to use. */
     PPDMIHOSTAUDIO        pDrvAudio;
@@ -156 +160 @@
     VKAT_TEST_OPT_PCM_SIGNED,
     VKAT_TEST_OPT_TAG,
+    VKAT_TEST_OPT_TEMPDIR,
     VKAT_TEST_OPT_VOL
 };
@@ -194 +199 @@
     { "--pcm-signed",       VKAT_TEST_OPT_PCM_SIGNED,     RTGETOPT_REQ_BOOL    },
     { "--tag",              VKAT_TEST_OPT_TAG,            RTGETOPT_REQ_STRING  },
+    { "--tempdir",          VKAT_TEST_OPT_TEMPDIR,        RTGETOPT_REQ_STRING  },
     { "--volume",           VKAT_TEST_OPT_VOL,            RTGETOPT_REQ_UINT8   }
 };
@@ -223 +229 @@
  * @param   pDrvAudio           Audio driver to use.
  * @param   pszPathOut          Output path to use. If NULL, the system's temp directory will be used.
- * @þaram   pszTag              Tag name to use. If NULL, a generated UUID will be used.
- */
-static int audioTestEnvInit(PAUDIOTESTENV pTstEnv, PPDMIHOSTAUDIO pDrvAudio, const char *pszPathOut, const char *pszTag)
-{
-    RT_BZERO(pTstEnv, sizeof(AUDIOTESTENV));
-
+ * @param   pszPathTemp         Temporary path to use. If NULL, the system's temp directory will be used.
+ * @param   pszTag              Tag name to use. If NULL, a generated UUID will be used.
+ */
+static int audioTestEnvInit(PAUDIOTESTENV pTstEnv, PPDMIHOSTAUDIO pDrvAudio, const char *pszTag)
+{
     pTstEnv->pDrvAudio = pDrvAudio;
     PDMAudioHostEnumInit(&pTstEnv->DevEnm);
 
-    return AudioTestSetCreate(&pTstEnv->Set, pszPathOut, pszTag);
+    int rc = VINF_SUCCESS;
+
+    char szPathTemp[RTPATH_MAX];
+    if (   !strlen(pTstEnv->szPathTemp)
+        || !strlen(pTstEnv->szPathOut))
+        rc = RTPathTemp(szPathTemp, sizeof(szPathTemp));
+
+    if (   RT_SUCCESS(rc)
+        && !strlen(pTstEnv->szPathTemp))
+        rc = RTPathJoin(pTstEnv->szPathTemp, sizeof(pTstEnv->szPathTemp), szPathTemp, "vkat-temp");
+
+    if (   RT_SUCCESS(rc)
+        && !strlen(pTstEnv->szPathOut))
+        rc = RTPathJoin(pTstEnv->szPathOut, sizeof(pTstEnv->szPathOut), szPathTemp, "vkat");
+
+    if (RT_SUCCESS(rc))
+        rc = AudioTestSetCreate(&pTstEnv->Set, pTstEnv->szPathTemp, pszTag);
+
+    if (RT_SUCCESS(rc))
+    {
+        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Using tag '%s'\n", pszTag);
+        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Output directory is '%s'\n", pTstEnv->szPathOut);
+        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Temp directory is '%s'\n", pTstEnv->szPathTemp);
+    }
+
+    return rc;
 }
 
@@ -585 +615 @@
     AudioTestToneInitRandom(&TstTone, &pParms->Props);
 
-    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Playing test tone (freq %RU16, %RU32ms)\n", TstTone.rdFreqHz, pParms->msDuration);
-
-    int rc;
+    const char *pcszPathOut = pTstEnv->Set.szPathAbs;
+
+    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Playing test tone (tone frequency is %RU16Hz, %RU32ms)\n", TstTone.rdFreqHz, pParms->msDuration);
+    RTTestPrintf(g_hTest, RTTESTLVL_DEBUG,  "Writing to '%s'\n", pcszPathOut);
+
+    /** @todo Use .WAV here? */
+    PAUDIOTESTOBJ pObj;
+    int rc = AudioTestSetObjCreateAndRegister(&pTstEnv->Set, "tone.pcm", &pObj);
+    AssertRCReturn(rc, rc);
 
     PDMHOSTAUDIOSTREAMSTATE enmState = pTstEnv->pDrvAudio->pfnStreamGetState(pTstEnv->pDrvAudio, &pStream->Backend);
@@ -601 +637 @@
         do
         {
-            rc = AudioTestToneWrite(&TstTone, abBuf, RT_MIN(cbPerMs, sizeof(abBuf)), &cbBuf);
+            rc = AudioTestToneGenerate(&TstTone, abBuf, RT_MIN(cbPerMs, sizeof(abBuf)), &cbBuf);
             if (RT_SUCCESS(rc))
             {
-                uint32_t cbWritten;
-                rc = pTstEnv->pDrvAudio->pfnStreamPlay(pTstEnv->pDrvAudio, &pStream->Backend, abBuf, cbBuf, &cbWritten);
+                /* Write stuff to disk before trying to play it. Help analysis later. */
+                rc = AudioTestSetObjWrite(pObj, abBuf, cbBuf);
+                if (RT_SUCCESS(rc))
+                {
+                    uint32_t cbWritten;
+                    rc = pTstEnv->pDrvAudio->pfnStreamPlay(pTstEnv->pDrvAudio, &pStream->Backend, abBuf, cbBuf, &cbWritten);
+                }
             }
 
             if (RTTimeMilliTS() - tsStartMs >= pParms->msDuration)
+                break;
+
+            if (RT_FAILURE(rc))
                 break;
 
@@ -617 +661 @@
     else
         rc = VERR_AUDIO_STREAM_NOT_READY;
+
+    int rc2 = AudioTestSetObjClose(pObj);
+    if (RT_SUCCESS(rc))
+        rc = rc2;
 
     return rc;
@@ -652 +700 @@
     PDMAudioPropsInit(&pTstParmsAcq->TestTone.Props, 16 /* bit */ / 8, true /* fSigned */, 2 /* Channels */, 44100 /* Hz */);
 
+#ifdef DEBUG_andy
+    pTstParmsAcq->cIterations = RTRandU32Ex(1, 1);
+#endif
     pTstParmsAcq->cIterations = RTRandU32Ex(1, 10);
+    pTstParmsAcq->idxCurrent  = 0;
 
     return VINF_SUCCESS;
@@ -806 +858 @@
 int audioTestMain(int argc, char **argv)
 {
-    int rc;
+    AUDIOTESTENV TstEnv;
+    RT_ZERO(TstEnv);
 
     AUDIOTESTPARMS TstCust;
@@ -812 +865 @@
 
     char *pszDevice  = NULL; /* Custom device to use. Can be NULL if not being used. */
-    char *pszPathOut = NULL; /* Custom output path to use. Can be NULL if not being used. */
     char *pszTag     = NULL; /* Custom tag to use. Can be NULL if not being used. */
 
@@ -820 +872 @@
     RTGETOPTUNION ValueUnion;
     RTGETOPTSTATE GetState;
-    rc = RTGetOptInit(&GetState, argc, argv, g_aCmdTestOptions, RT_ELEMENTS(g_aCmdTestOptions), 0, 0 /* fFlags */);
+    int rc = RTGetOptInit(&GetState, argc, argv, g_aCmdTestOptions, RT_ELEMENTS(g_aCmdTestOptions), 0, 0 /* fFlags */);
     AssertRCReturn(rc, RTEXITCODE_INIT);
 
@@ -915 +967 @@
             case VKAT_TEST_OPT_OUTDIR:
             {
-                pszPathOut = RTStrDup(ValueUnion.psz);
+                rc = RTStrCopy(TstEnv.szPathOut, sizeof(TstEnv.szPathOut), ValueUnion.psz);
+                if (RT_FAILURE(rc))
+                    return RTMsgErrorExit(RTEXITCODE_FAILURE, "Out dir invalid, rc=%Rrc\n", rc);
                 break;
             }
@@ -946 +1000 @@
             {
                 pszTag = RTStrDup(ValueUnion.psz);
+                break;
+            }
+
+            case VKAT_TEST_OPT_TEMPDIR:
+            {
+                rc = RTStrCopy(TstEnv.szPathTemp, sizeof(TstEnv.szPathTemp), ValueUnion.psz);
+                if (RT_FAILURE(rc))
+                    return RTMsgErrorExit(RTEXITCODE_FAILURE, "Temp dir invalid, rc=%Rrc\n", rc);
                 break;
             }
@@ -982 +1044 @@
     {
         /* For now all tests have the same test environment. */
-        AUDIOTESTENV TstEnv;
-        rc = audioTestEnvInit(&TstEnv, pDrvAudio, pszPathOut, pszTag);
+        rc = audioTestEnvInit(&TstEnv, pDrvAudio, pszTag);
         if (RT_SUCCESS(rc))
         {
-            RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Output directory is '%s'\n", TstEnv.Set.szPathAbs);
-
             PPDMAUDIOHOSTDEV pDev;
             rc = audioTestDevicesEnumerateAndCheck(&TstEnv, pszDevice, &pDev);
@@ -993 +1052 @@
                 audioTestWorker(&TstEnv, &TstCust);
 
+            /* Before destroying the test environment, pack up the test set so
+             * that it's ready for transmission. */
+            char szFileOut[RTPATH_MAX];
+            rc = AudioTestSetPack(&TstEnv.Set, TstEnv.szPathOut, szFileOut, sizeof(szFileOut));
+            if (RT_SUCCESS(rc))
+                RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Test set packed up to '%s'\n", szFileOut);
+
+            /* Clean up. */
+            AudioTestSetWipe(&TstEnv.Set);
+
             audioTestEnvDestroy(&TstEnv);
         }
@@ -1001 +1070 @@
 
     RTStrFree(pszDevice);
-    RTStrFree(pszPathOut);
     RTStrFree(pszTag);
+
+    if (RT_FAILURE(rc)) /* Let us know that something went wrong in case we forgot to mention it. */
+        RTTestFailed(g_hTest, "Tested failed with %Rrc\n", rc);
 
     /*