Changeset 90899 in vbox

Timestamp:

Aug 26, 2021 7:58:35 AM (3 years ago)

Author:

vboxsync

Message:

Audio/VKAT: Simplified self-test. bugref:10008

File:

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

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

@@ -8 +8 @@
  *
  * This self-test does the following:
- * - 1. a) Creates an ATS instance to emulate the guest mode ("--mode guest")
- *         at port 6042 (ATS_TCP_DEF_BIND_PORT_GUEST).
- *      or
- *      b) Connect to an already existing guest ATS instance if "--guest-ats-address" is specified.
- *      This makes it more flexible in terms of testing / debugging.
+ * - 1. Creates a separate thread for the guest side VKAT and connects to the ATS instance on
+ *      the host side at port 6052 (ATS_TCP_DEF_BIND_PORT_HOST).
  * - 2. Uses the Validation Kit audio backend, which in turn creates an ATS instance
  *      listening at port 6062 (ATS_TCP_DEF_BIND_PORT_VALKIT).
@@ -220 +217 @@
             rc = RTThreadUserWait(hThreadGstAts, RT_MS_30SEC);
     }
-    /* else Step 1a later. */
 
     RTThreadSleep(2000); /* Fudge: Wait until guest ATS is up. 2 seconds should be enough (tm). */
@@ -277 +273 @@
 
 /**
- * Long option values for the 'selftest' command.
- */
-enum
-{
-    VKAT_SELFTEST_OPT_GUEST_ATS_ADDR = 900,
-    VKAT_SELFTEST_OPT_GUEST_ATS_PORT,
-    VKAT_SELFTEST_OPT_HOST_ATS_ADDR,
-    VKAT_SELFTEST_OPT_HOST_ATS_PORT
-};
-
-/**
  * Command line parameters for self-test mode.
  */
 static const RTGETOPTDEF s_aCmdSelftestOptions[] =
 {
-    { "--guest-ats-addr",   VKAT_SELFTEST_OPT_GUEST_ATS_ADDR,   RTGETOPT_REQ_STRING  },
-    { "--guest-ats-port",   VKAT_SELFTEST_OPT_GUEST_ATS_PORT,   RTGETOPT_REQ_UINT32  },
-    { "--host-ats-addr",    VKAT_SELFTEST_OPT_HOST_ATS_ADDR,    RTGETOPT_REQ_STRING  },
-    { "--host-ats-port",    VKAT_SELFTEST_OPT_HOST_ATS_PORT,    RTGETOPT_REQ_UINT32  },
     { "--exclude-all",      'a',                                RTGETOPT_REQ_NOTHING },
     { "--backend",          'b',                                RTGETOPT_REQ_STRING  },
@@ -308 +289 @@
     switch (pOpt->iShort)
     {
-        case 'a':                              return "Exclude all tests from the list (useful to enable single tests later with --include)";
-        case 'b':                              return "The audio backend to use";
-        case 'd':                              return "Go via DrvAudio instead of directly interfacing with the backend";
-        case 'e':                              return "Exclude the given test id from the list";
-        case 'i':                              return "Include the given test id in the list";
-        case VKAT_SELFTEST_OPT_GUEST_ATS_ADDR: return "Address of guest ATS to connect to\n"
-                                                      "    Default: 127.0.0.1; will start own guest ATS";
-        case VKAT_SELFTEST_OPT_GUEST_ATS_PORT: return "Port of guest ATS to connect to\n"
-                                                      "    Default: 6042"; /* ATS_TCP_DEF_CONNECT_PORT_GUEST */
-        case VKAT_SELFTEST_OPT_HOST_ATS_ADDR:  return "Address of host ATS to connect to\n"
-                                                      "    Default: " ATS_TCP_DEF_CONNECT_HOST_ADDR_STR;
-        case VKAT_SELFTEST_OPT_HOST_ATS_PORT:  return "Port of host ATS to connect to\n"
-                                                      "    Default: 6052"; /* ATS_TCP_DEF_BIND_PORT_VALKIT */
+        case 'a': return "Exclude all tests from the list (useful to enable single tests later with --include)";
+        case 'b': return "The audio backend to use";
+        case 'd': return "Go via DrvAudio instead of directly interfacing with the backend";
+        case 'e': return "Exclude the given test id from the list";
+        case 'i': return "Include the given test id in the list";
         default:  return NULL;
     }
@@ -342 +315 @@
         switch (rc)
         {
-            case VKAT_SELFTEST_OPT_GUEST_ATS_ADDR:
-                rc = RTStrCopy(g_Ctx.Host.szGuestAtsAddr, sizeof(g_Ctx.Host.szGuestAtsAddr), ValueUnion.psz);
-                break;
-
-            case VKAT_SELFTEST_OPT_GUEST_ATS_PORT:
-                g_Ctx.Host.uGuestAtsPort = ValueUnion.u32;
-                break;
-
-            case VKAT_SELFTEST_OPT_HOST_ATS_ADDR:
-                rc = RTStrCopy(g_Ctx.Host.szValKitAtsAddr, sizeof(g_Ctx.Host.szValKitAtsAddr), ValueUnion.psz);
-                break;
-
-            case VKAT_SELFTEST_OPT_HOST_ATS_PORT:
-                g_Ctx.Host.uValKitAtsPort = ValueUnion.u32;
-                break;
-
             case 'a':
                 for (unsigned i = 0; i < g_cTests; i++)