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

Timestamp:

Oct 25, 2021 5:40:49 PM (3 years ago)

Author:

vboxsync

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

147860

Message:

Audio/Validation Kit: Use the RTTEST macros in selftest mode. ​bugref:10008

File:

• trunk/src/VBox/ValidationKit/utils/audio/vkatCmdSelfTest.cpp (modified) (8 diffs)

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

@@ -134 +134 @@
     int rc = audioTestDriverStackProbe(&DrvStack, pDrvReg,
                                        true /* fEnabledIn */, true /* fEnabledOut */, false /* fWithDrvAudio */);
-    AssertRCReturn(rc, rc);
+    RTTEST_CHECK_RC_OK_RET(g_hTest, rc, rc);
 
     AUDIOTESTIOOPTS IoOpts;
@@ -147 +147 @@
 
     rc = audioTestDriverStackStreamEnable(&DrvStack, pStream);
-    AssertRCReturn(rc, rc);
-
-    AssertReturn(audioTestDriverStackStreamIsOkay(&DrvStack, pStream), VERR_AUDIO_STREAM_NOT_READY);
+    RTTEST_CHECK_RC_OK_RET(g_hTest, rc, rc);
+
+    RTTEST_CHECK_RET(g_hTest, audioTestDriverStackStreamIsOkay(&DrvStack, pStream), VERR_AUDIO_STREAM_NOT_READY);
 
     uint8_t abBuf[_4K];
@@ -156 +156 @@
     uint32_t cbWritten;
     rc = audioTestDriverStackStreamPlay(&DrvStack, pStream, abBuf, sizeof(abBuf), &cbWritten);
-    AssertRCReturn(rc, rc);
-    AssertReturn(cbWritten == sizeof(abBuf), VERR_AUDIO_STREAM_NOT_READY);
+    RTTEST_CHECK_RC_OK_RET(g_hTest, rc, rc);
+    RTTEST_CHECK_RET(g_hTest, cbWritten == sizeof(abBuf), VERR_AUDIO_STREAM_NOT_READY);
 
     audioTestDriverStackStreamDrain(&DrvStack, pStream, true /* fSync */);
@@ -199 +199 @@
     /* Generate tag for guest side. */
     int rc = RTStrCopy(pTstEnvGst->szTag, sizeof(pTstEnvGst->szTag), pCtx->szTag);
-    AssertRCReturn(rc, rc);
+    RTTEST_CHECK_RC_OK_RET(g_hTest, rc, rc);
 
     rc = AudioTestPathCreateTemp(pTstEnvGst->szPathTemp, sizeof(pTstEnvGst->szPathTemp), "selftest-guest");
-    AssertRCReturn(rc, rc);
+    RTTEST_CHECK_RC_OK_RET(g_hTest, rc, rc);
 
     rc = AudioTestPathCreateTemp(pTstEnvGst->szPathOut, sizeof(pTstEnvGst->szPathOut), "selftest-out");
-    AssertRCReturn(rc, rc);
+    RTTEST_CHECK_RC_OK_RET(g_hTest, rc, rc);
 
     pTstEnvGst->enmMode = AUDIOTESTMODE_GUEST;
@@ -214 +214 @@
         RTThreadUserSignal(hThread);
 
-        audioTestWorker(pTstEnvGst);
+        rc = audioTestWorker(pTstEnvGst);
+        RTTEST_CHECK_RC_OK_RET(g_hTest, rc, rc);
+
         audioTestEnvDestroy(pTstEnvGst);
     }
@@ -233 +235 @@
     /* Generate a common tag for guest and host side. */
     int rc = AudioTestGenTag(pCtx->szTag, sizeof(pCtx->szTag));
-    AssertRCReturn(rc, RTEXITCODE_FAILURE);
+    RTTEST_CHECK_RC_OK_RET(g_hTest, rc, RTEXITCODE_FAILURE);
 
     PAUDIOTESTENV pTstEnvHst = &pCtx->Host.TstEnv;
@@ -248 +250 @@
     /* Generate tag for host side. */
     rc = RTStrCopy(pTstEnvHst->szTag, sizeof(pTstEnvHst->szTag), pCtx->szTag);
-    AssertRCReturn(rc, RTEXITCODE_FAILURE);
+    RTTEST_CHECK_RC_OK_RET(g_hTest, rc, RTEXITCODE_FAILURE);
 
     rc = AudioTestPathCreateTemp(pTstEnvHst->szPathTemp, sizeof(pTstEnvHst->szPathTemp), "selftest-tmp");
-    AssertRCReturn(rc, RTEXITCODE_FAILURE);
+    RTTEST_CHECK_RC_OK_RET(g_hTest, rc, RTEXITCODE_FAILURE);
 
     rc = AudioTestPathCreateTemp(pTstEnvHst->szPathOut, sizeof(pTstEnvHst->szPathOut), "selftest-out");
-    AssertRCReturn(rc, RTEXITCODE_FAILURE);
+    RTTEST_CHECK_RC_OK_RET(g_hTest, rc, RTEXITCODE_FAILURE);
 
     /*
@@ -287 +289 @@
              */
             rc = audioTestWorker(pTstEnvHst);
-            if (RT_SUCCESS(rc))
-            {
-
-            }
+            RTTEST_CHECK_RC_OK(g_hTest, rc);
 
             audioTestEnvDestroy(pTstEnvHst);