Changeset 89086 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

May 17, 2021 9:57:51 AM (4 years ago)

Author:

vboxsync

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

144426

Message:

ValKit/Audio: Allow common options to be specified after the command. bugref:10008

File:

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

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

@@ -65 +65 @@
 #include "../../../Devices/Audio/AudioTest.h"
 #include "VBoxDD.h"
+
+
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
+/** For use in the option switch to handle common options. */
+#define AUDIO_TEST_COMMON_OPTION_CASES() \
+            case 'q': \
+                g_uVerbosity = 0; \
+                break; \
+            \
+            case 'v': \
+                g_uVerbosity++; \
+                break; \
+            \
+            case 'V': \
+                return audioTestVersion(); \
+            \
+            case 'h': \
+                return audioTestUsage(g_pStdOut)
+
 
 
@@ -1672 +1693 @@
  * Main (entry) function for the testing functionality of VKAT.
  *
- * @returns RTEXITCODE
- * @param   argc                Number of argv arguments.
- * @param   argv                argv arguments.
- */
-static DECLCALLBACK(RTEXITCODE) audioTestMain(int argc, char **argv)
+ * @returns Program exit code.
+ * @param   pGetState   RTGetOpt state.
+ */
+static DECLCALLBACK(RTEXITCODE) audioTestMain(PRTGETOPTSTATE pGetState)
 {
     AUDIOTESTENV TstEnv;
@@ -1688 +1708 @@
     PCPDMDRVREG pDrvReg    = g_aBackends[0].pDrvReg;
 
-    RTGETOPTSTATE GetState;
-    int rc = RTGetOptInit(&GetState, argc, argv, g_aCmdTestOptions, RT_ELEMENTS(g_aCmdTestOptions), 1, 0 /*fFlags*/);
-    AssertRCReturn(rc, RTEXITCODE_INIT);
-
+    int           rc;
     RTGETOPTUNION ValueUnion;
-    while ((rc = RTGetOpt(&GetState, &ValueUnion)))
+    while ((rc = RTGetOpt(pGetState, &ValueUnion)))
     {
         switch (rc)
@@ -1775 +1792 @@
                 break;
 
-            case 'V':
-                return audioTestVersion();
-            case 'h':
-                return audioTestUsage(g_pStdOut);
+            AUDIO_TEST_COMMON_OPTION_CASES();
 
             default:
@@ -1885 +1899 @@
  * Main (entry) function for the verification functionality of VKAT.
  *
- * @returns RTEXITCODE
- * @param   argc                Number of argv arguments.
- * @param   argv                argv arguments.
- */
-static DECLCALLBACK(RTEXITCODE) audioVerifyMain(int argc, char **argv)
+ * @returns Program exit code.
+ * @param   pGetState   RTGetOpt state.
+ */
+static DECLCALLBACK(RTEXITCODE) audioVerifyMain(PRTGETOPTSTATE pGetState)
 {
     /*
      * Parse options and process arguments.
      */
-    RTGETOPTSTATE GetState;
-    int rc = RTGetOptInit(&GetState, argc, argv, g_aCmdVerifyOptions, RT_ELEMENTS(g_aCmdVerifyOptions),
-                          1, RTGETOPTINIT_FLAGS_OPTS_FIRST);
-    AssertRCReturn(rc, RTEXITCODE_INIT);
-
     const char   *pszTag   = NULL; /* Custom tag to use. Can be NULL if not being used. */
     unsigned      iTestSet = 0;
+
+    int           rc;
     RTGETOPTUNION ValueUnion;
-    while ((rc = RTGetOpt(&GetState, &ValueUnion)))
+    while ((rc = RTGetOpt(pGetState, &ValueUnion)))
     {
         switch (rc)
@@ -1919 +1929 @@
                 break;
 
-            case 'V':
-                return audioTestVersion();
-            case 'h':
-                return audioTestUsage(g_pStdOut);
+            AUDIO_TEST_COMMON_OPTION_CASES();
 
             default:
@@ -2112 +2119 @@
  *
  * @returns Program exit code.
- * @param   argc                Number of argv arguments.
- * @param   argv                argv arguments.
- */
-static DECLCALLBACK(RTEXITCODE) audioTestCmdPlayHandler(int argc, char **argv)
+ * @param   pGetState   RTGetOpt state.
+ */
+static DECLCALLBACK(RTEXITCODE) audioTestCmdPlayHandler(PRTGETOPTSTATE pGetState)
 {
     /* Option values: */
@@ -2124 +2130 @@
     bool        fWithDrvAudio     = false;
 
-    /* Init option state: */
-    RTGETOPTSTATE GetState;
-    int rc = RTGetOptInit(&GetState, argc, argv, g_aCmdPlayOptions, RT_ELEMENTS(g_aCmdPlayOptions),
-                          1 /*iFirst*/, RTGETOPTINIT_FLAGS_OPTS_FIRST);
-    AssertRCReturn(rc, RTEXITCODE_INIT);
-
     /* Argument processing loop: */
+    int           rc;
     RTGETOPTUNION ValueUnion;
-    while ((rc = RTGetOpt(&GetState, &ValueUnion)) != 0)
+    while ((rc = RTGetOpt(pGetState, &ValueUnion)) != 0)
     {
         switch (rc)
@@ -2162 +2163 @@
             }
 
-            case 'V':
-                return audioTestVersion();
-            case 'h':
-                return audioTestUsage(g_pStdOut);
+            AUDIO_TEST_COMMON_OPTION_CASES();
 
             default:
@@ -2183 +2181 @@
     const char     *pszCommand;
     /** The command handler.   */
-    DECLCALLBACKMEMBER(RTEXITCODE, pfnHandler,(int argc, char **argv));
+    DECLCALLBACKMEMBER(RTEXITCODE, pfnHandler,(PRTGETOPTSTATE pGetState));
 
     /** Command description.   */
@@ -2291 +2289 @@
      * Process common options.
      */
-    RTGETOPTUNION ValueUnion;
     RTGETOPTSTATE GetState;
     int rc = RTGetOptInit(&GetState, argc, argv, g_aCmdCommonOptions,
@@ -2297 +2294 @@
     AssertRCReturn(rc, RTEXITCODE_INIT);
 
+    RTGETOPTUNION ValueUnion;
     while ((rc = RTGetOpt(&GetState, &ValueUnion)) != 0)
     {
@@ -2321 +2319 @@
                     if (strcmp(ValueUnion.psz, g_aCommands[i].pszCommand) == 0)
                     {
-                        audioTestShowLogo(g_pStdOut);
-                        int32_t iCurArg = GetState.iNext - 1;
-                        return g_aCommands[i].pfnHandler(argc - iCurArg, argv + iCurArg);
+                        size_t const cCombinedOptions  = g_aCommands[i].cOptions + RT_ELEMENTS(g_aCmdCommonOptions);
+                        PRTGETOPTDEF paCombinedOptions = (PRTGETOPTDEF)RTMemAlloc(cCombinedOptions * sizeof(RTGETOPTDEF));
+                        if (paCombinedOptions)
+                        {
+                            memcpy(paCombinedOptions, g_aCmdCommonOptions, sizeof(g_aCmdCommonOptions));
+                            memcpy(&paCombinedOptions[RT_ELEMENTS(g_aCmdCommonOptions)],
+                                   g_aCommands[i].paOptions, g_aCommands[i].cOptions * sizeof(RTGETOPTDEF));
+
+                            rc = RTGetOptInit(&GetState, argc, argv, paCombinedOptions, cCombinedOptions,
+                                              GetState.iNext /*idxFirst*/, RTGETOPTINIT_FLAGS_OPTS_FIRST);
+                            if (RT_SUCCESS(rc))
+                            {
+
+                                rcExit = g_aCommands[i].pfnHandler(&GetState);
+                                RTMemFree(paCombinedOptions);
+                                return rcExit;
+                            }
+                            return RTMsgErrorExitFailure("RTGetOptInit failed for '%s': %Rrc", ValueUnion.psz, rc);
+                        }
+                        return RTMsgErrorExitFailure("Out of memory!");
                     }
                 RTMsgError("Unknown command '%s'!\n", ValueUnion.psz);