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

Timestamp:

Jun 15, 2021 3:08:23 PM (4 years ago)

Author:

vboxsync

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

145159

Message:

Audio/ValKit: More validation code. bugref:10008

File:

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

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

@@ -489 +489 @@
     else if (pTstEnv->enmMode == AUDIOTESTMODE_HOST)
     {
-        /* Generate tags for the host and guest side. */
-        char szTagHost [AUDIOTEST_TAG_MAX];
-        char szTagGuest[AUDIOTEST_TAG_MAX];
-
-        rc = RTStrPrintf2(szTagHost, sizeof(szTagHost),   "%s-host",  pTstEnv->szTag);
-        AssertRCReturn(rc, rc);
-        rc = RTStrPrintf2(szTagGuest, sizeof(szTagGuest), "%s-guest", pTstEnv->szTag);
-        AssertRCReturn(rc, rc);
-
-        RTTestPrintf(g_hTest, RTTESTLVL_DEBUG, "Guest test set tag is '%s'\n", szTagGuest);
-        RTTestPrintf(g_hTest, RTTESTLVL_DEBUG, "Host test set tag is '%s'\n", szTagHost);
-
-        rc = AudioTestSvcClientTestSetBegin(&pTstEnv->u.Host.AtsClValKit, szTagHost);
+        RTTestPrintf(g_hTest, RTTESTLVL_DEBUG, "Using tag '%s'\n", pTstEnv->szTag);
+
+        rc = AudioTestSvcClientTestSetBegin(&pTstEnv->u.Host.AtsClValKit, pTstEnv->szTag);
         if (RT_SUCCESS(rc))
-            rc = AudioTestSvcClientTestSetBegin(&pTstEnv->u.Host.AtsClGuest, szTagGuest);
+            rc = AudioTestSvcClientTestSetBegin(&pTstEnv->u.Host.AtsClGuest, pTstEnv->szTag);
 
         if (RT_SUCCESS(rc))
@@ -521 +511 @@
             }
 
-            int rc2 = AudioTestSvcClientTestSetEnd(&pTstEnv->u.Host.AtsClGuest, szTagGuest);
+            int rc2 = AudioTestSvcClientTestSetEnd(&pTstEnv->u.Host.AtsClGuest, pTstEnv->szTag);
             if (RT_SUCCESS(rc))
                 rc = rc2;
 
-            rc2 = AudioTestSvcClientTestSetEnd(&pTstEnv->u.Host.AtsClValKit, szTagHost);
+            rc2 = AudioTestSvcClientTestSetEnd(&pTstEnv->u.Host.AtsClValKit, pTstEnv->szTag);
             if (RT_SUCCESS(rc))
                 rc = rc2;
@@ -535 +525 @@
                  */
                 char szFileName[RTPATH_MAX];
-                if (RTStrPrintf2(szFileName, sizeof(szFileName), "%s.tar.gz", szTagGuest))
+                if (RTStrPrintf2(szFileName, sizeof(szFileName), "%s-guest.tar.gz", pTstEnv->szTag))
                 {
                     rc = RTPathJoin(pTstEnv->u.Host.szPathTestSetGuest, sizeof(pTstEnv->u.Host.szPathTestSetGuest),
@@ -541 +531 @@
                     if (RT_SUCCESS(rc))
                     {
-                        if (RTStrPrintf2(szFileName, sizeof(szFileName), "%s.tar.gz", szTagHost))
+                        if (RTStrPrintf2(szFileName, sizeof(szFileName), "%s-host.tar.gz", pTstEnv->szTag))
                         {
                             rc = RTPathJoin(pTstEnv->u.Host.szPathTestSetValKit, sizeof(pTstEnv->u.Host.szPathTestSetValKit),
@@ -557 +547 @@
                                      pTstEnv->u.Host.szPathTestSetGuest);
                         rc = AudioTestSvcClientTestSetDownload(&pTstEnv->u.Host.AtsClGuest,
-                                                               szTagGuest, pTstEnv->u.Host.szPathTestSetGuest);
+                                                               pTstEnv->szTag, pTstEnv->u.Host.szPathTestSetGuest);
                     }
 
@@ -565 +555 @@
                                      pTstEnv->u.Host.szPathTestSetValKit);
                         rc = AudioTestSvcClientTestSetDownload(&pTstEnv->u.Host.AtsClValKit,
-                                                               szTagHost, pTstEnv->u.Host.szPathTestSetValKit);
+                                                               pTstEnv->szTag, pTstEnv->u.Host.szPathTestSetValKit);
                     }
                 }
@@ -874 +864 @@
         if (RT_SUCCESS(rc))
         {
+            RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "%RU32 errors occurred while verifying\n", AudioTestErrorDescCount(&errDesc));
             if (AudioTestErrorDescFailed(&errDesc))
             {