Changeset 91119 in vbox for trunk/src/VBox/ValidationKit/utils/audio

Timestamp:

Sep 6, 2021 9:35:26 AM (3 years ago)

Author:

vboxsync

Message:

Audio/Validation Kit: Separated the audio testing and the actual audio verification into two steps to have a more fine-grained result in the test manager. Also, now using more meaningful test tags which contain a timestamp and the VM name for easier retrieval / identification. ​bugref:10008

File:

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

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

@@ -670 +670 @@
                     RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Verification skipped\n");
 
-                RTFileDelete(pTstEnv->u.Host.szPathTestSetGuest);
-                RTFileDelete(pTstEnv->u.Host.szPathTestSetValKit);
+                if (!pTstEnv->fSkipVerify)
+                {
+                    RTFileDelete(pTstEnv->u.Host.szPathTestSetGuest);
+                    RTFileDelete(pTstEnv->u.Host.szPathTestSetValKit);
+                }
+                else
+                    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Leaving test set files behind\n");
             }
         }
@@ -750 +755 @@
     int         rc;
 
-    const char *pszTag        = NULL; /* Custom tag to use. Can be NULL if not being used. */
     PCPDMDRVREG pDrvReg       = AudioTestGetDefaultBackend();
     bool        fWithDrvAudio = false;
@@ -862 +866 @@
 
             case VKAT_TEST_OPT_TAG:
-                pszTag = ValueUnion.psz;
+                rc = RTStrCopy(TstEnv.szTag, sizeof(TstEnv.szTag), ValueUnion.psz);
+                if (RT_FAILURE(rc))
+                    return RTMsgErrorExit(RTEXITCODE_FAILURE, "Tag invalid, rc=%Rrc", rc);
                 break;
 
@@ -978 +984 @@
 
     const bool fPacked = AudioTestSetIsPacked(pszPathSet);
+
     if (fPacked)
     {
         RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Test set is an archive and needs to be unpacked\n");
 
-        char szPathTemp[RTPATH_MAX];
-        rc = RTPathTemp(szPathTemp, sizeof(szPathTemp));
+        if (!RTFileExists(pszPathSet))
+        {
+            RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Test set '%s' does not exist\n", pszPathSet);
+            rc = VERR_FILE_NOT_FOUND;
+        }
+        else
+            rc = VINF_SUCCESS;
+
         if (RT_SUCCESS(rc))
         {
-            RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Using temporary directory '%s'\n", szPathTemp);
-
-            rc = RTPathJoin(szPathExtracted, sizeof(szPathExtracted), szPathTemp, "vkat-testset-XXXX");
+            char szPathTemp[RTPATH_MAX];
+            rc = RTPathTemp(szPathTemp, sizeof(szPathTemp));
             if (RT_SUCCESS(rc))
             {
-                rc = RTDirCreateTemp(szPathExtracted, 0755);
+                RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Using temporary directory '%s'\n", szPathTemp);
+
+                rc = RTPathJoin(szPathExtracted, sizeof(szPathExtracted), szPathTemp, "vkat-testset-XXXX");
                 if (RT_SUCCESS(rc))
                 {
-                    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Unpacking archive to '%s'\n", szPathExtracted);
-                    rc = AudioTestSetUnpack(pszPathSet, szPathExtracted);
+                    rc = RTDirCreateTemp(szPathExtracted, 0755);
                     if (RT_SUCCESS(rc))
-                        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Archive successfully unpacked\n");
+                    {
+                        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Unpacking archive to '%s'\n", szPathExtracted);
+                        rc = AudioTestSetUnpack(pszPathSet, szPathExtracted);
+                        if (RT_SUCCESS(rc))
+                            RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Archive successfully unpacked\n");
+                    }
                 }
             }