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

Timestamp:

Feb 21, 2024 7:29:19 PM (12 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

161850

Message:

Audio/VKAT: Use a new define for default timeout, improved logging a bit.

Location:

trunk/src/VBox/ValidationKit/utils/audio

Files:

• vkatCommon.cpp (modified) (5 diffs)
• vkatInternal.h (modified) (1 diff)

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

@@ -552 +552 @@
         }
 
-        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Test #%RU32: Playing %RU32 bytes total\n", idxTest, cbToWriteTotal);
+        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Test #%RU32: Playing %RU32 bytes total (%RU32ms timeout)\n",
+                     idxTest, cbToWriteTotal, pTstEnv->msTimeout);
+
+        /* Failsafe if invalid timeout is set. */
+        if (   pTstEnv->msTimeout == 0
+            || pTstEnv->msTimeout == UINT32_MAX)
+        {
+            RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Test #%RU32: Warning! Invalid timeout set (%RU32ms), setting default\n",
+                         pTstEnv->msTimeout);
+            pTstEnv->msTimeout = AUDIOTEST_TIMEOUT_DEFAULT_MS;
+        }
 
         AudioTestObjAddMetadataStr(Obj, "test_id=%04RU32\n", pParms->Hdr.idxTest);
@@ -844 +854 @@
         uint32_t cbTestRec   = 0;
 
-        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Test #%RU32: Recording %RU32 bytes total\n", idxTest, cbTestToRec);
+        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Test #%RU32: Recording %RU32 bytes total (%RU32ms timeout)\n",
+                     idxTest, cbTestToRec, pTstEnv->msTimeout);
+
+        /* Failsafe if invalid timeout is set. */
+        if (   pTstEnv->msTimeout == 0
+            || pTstEnv->msTimeout == UINT32_MAX)
+        {
+            RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Test #%RU32: Warning! Invalid timeout set (%RU32ms), setting default\n",
+                         pTstEnv->msTimeout);
+            pTstEnv->msTimeout = AUDIOTEST_TIMEOUT_DEFAULT_MS;
+        }
 
         /* We expect a pre + post beacon before + after the actual test tone.
@@ -1474 +1494 @@
     RT_BZERO(pTstEnv, sizeof(AUDIOTESTENV));
 
-    pTstEnv->msTimeout = RT_MS_5MIN; /* Timeout defaults to 5 minutes. */
+    pTstEnv->msTimeout = AUDIOTEST_TIMEOUT_DEFAULT_MS;
 
     audioTestIoOptsInitDefaults(&pTstEnv->IoOpts);
@@ -1499 +1519 @@
      */
     if (!RTStrNLen(pTstEnv->szTag, sizeof(pTstEnv->szTag)))
-    {
         rc = AudioTestGenTag(pTstEnv->szTag, sizeof(pTstEnv->szTag));
-        AssertRCReturn(rc, rc);
-    }
 
     if (!RTStrNLen(pTstEnv->szPathTemp, sizeof(pTstEnv->szPathTemp)))
     {
-        rc = AudioTestPathGetTemp(pTstEnv->szPathTemp, sizeof(pTstEnv->szPathTemp));
-        AssertRCReturn(rc, rc);
+        int rc2 = AudioTestPathGetTemp(pTstEnv->szPathTemp, sizeof(pTstEnv->szPathTemp));
+        if (RT_SUCCESS(rc))
+            rc = rc2;
     }
 
     if (!RTStrNLen(pTstEnv->szPathOut, sizeof(pTstEnv->szPathOut)))
     {
-        rc = RTPathJoin(pTstEnv->szPathOut, sizeof(pTstEnv->szPathOut), pTstEnv->szPathTemp, "vkat-temp");
-        AssertRCReturn(rc, rc);
+        int rc2 = RTPathJoin(pTstEnv->szPathOut, sizeof(pTstEnv->szPathOut), pTstEnv->szPathTemp, "vkat-temp");
+        if (RT_SUCCESS(rc))
+            rc = rc2;
+    }
+
+    char szPathTemp[RTPATH_MAX];
+    if (   RT_SUCCESS(rc)
+        && (   !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))
+    {
+        rc = RTDirCreate(pTstEnv->szPathTemp, RTFS_UNIX_IRWXU, 0 /* fFlags */);
+        if (rc == VERR_ALREADY_EXISTS)
+            rc = VINF_SUCCESS;
+    }
+
+    if (   RT_SUCCESS(rc)
+        && !strlen(pTstEnv->szPathOut))
+        rc = RTPathJoin(pTstEnv->szPathOut, sizeof(pTstEnv->szPathOut), szPathTemp, "vkat");
+
+    if (RT_SUCCESS(rc))
+    {
+        rc = RTDirCreate(pTstEnv->szPathOut, RTFS_UNIX_IRWXU, 0 /* fFlags */);
+        if (rc == VERR_ALREADY_EXISTS)
+            rc = VINF_SUCCESS;
     }
 
@@ -1521 +1568 @@
     RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Temp directory is '%s'\n", pTstEnv->szPathTemp);
 
-    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))
-    {
-        rc = RTDirCreate(pTstEnv->szPathTemp, RTFS_UNIX_IRWXU, 0 /* fFlags */);
-        if (rc == VERR_ALREADY_EXISTS)
-            rc = VINF_SUCCESS;
-    }
-
-    if (   RT_SUCCESS(rc)
-        && !strlen(pTstEnv->szPathOut))
-        rc = RTPathJoin(pTstEnv->szPathOut, sizeof(pTstEnv->szPathOut), szPathTemp, "vkat");
-
-    if (RT_SUCCESS(rc))
-    {
-        rc = RTDirCreate(pTstEnv->szPathOut, RTFS_UNIX_IRWXU, 0 /* fFlags */);
-        if (rc == VERR_ALREADY_EXISTS)
-            rc = VINF_SUCCESS;
-    }
-
     if (RT_FAILURE(rc))
+    {
+        RTTestFailed(g_hTest, "Initializing test directories failed with %Rrc\n", rc);
         return rc;
+    }
 
     /**

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

@@ -57 +57 @@
 
 #include "VBoxDD.h"
+
+
+/*********************************************************************************************************************************
+*   Common defines                                                                                                               *
+*********************************************************************************************************************************/
+/** Default (failsafe) timeout (in ms). */
+#define AUDIOTEST_TIMEOUT_DEFAULT_MS   RT_MS_5MIN