Changeset 91212 in vbox

Timestamp:

Sep 10, 2021 5:04:03 PM (3 years ago)

Author:

vboxsync

Message:

Audio/VKAT: Implemented support for (optional) VKAT "test" command arguments in the test driver. bugref:10008

File:

• trunk/src/VBox/ValidationKit/tests/audio/tdAudioTest.py (modified) (4 diffs)

trunk/src/VBox/ValidationKit/tests/audio/tdAudioTest.py

@@ -85 +85 @@
         self.asTests          = self.asTestsDef;
 
+        # Optional arguments passing to VKAT when doing the actual audio tests.
+        self.asVkatTestArgs   = [];
         # Optional arguments passing to VKAT when verifying audio test sets.
         self.asVkatVerifyArgs = [];
@@ -110 +112 @@
         reporter.log('  --audio-tests   <s1[:s2[:]]>');
         reporter.log('      Default: %s  (all)' % (':'.join(self.asTestsDef)));
+        reporter.log('  --audio-test-count <number>');
+        reporter.log('      Default: 0 (means random)');
         reporter.log('  --audio-verify-max-diff-count <number>');
         reporter.log('      Default: 0 (strict)');
@@ -138 +142 @@
                         raise base.InvalidOption('The "--audio-tests" value "%s" is not valid; valid values are: %s'
                                                     % (s, ' '.join(self.asTestsDef)));
+        elif    asArgs[iArg] == '--audio-test-count':
+            # Strip the "--audio-test-" prefix and keep the options as defined in VKAT,
+            # e.g. "--audio-test-count" -> "--count". That way we don't
+            # need to do any special argument translation and whatnot.
+            self.asVkatTestArgs.extend(['--' + asArgs[iArg][len('--audio-test-'):]]);
+            iArg += 1;
+            if iArg >= len(asArgs):
+                raise base.InvalidOption('Option "%s" needs a value' % (asArgs[iArg - 1]));
+            self.asVkatTestArgs.extend([asArgs[iArg]]);
         elif    asArgs[iArg] == '--audio-verify-max-diff-count' \
              or asArgs[iArg] == '--audio-verify-max-diff-percent' \
@@ -528 +541 @@
             asArgs.extend([ '-v' ]);
 
+        if self.asVkatTestArgs:
+            asArgs += self.asVkatTestArgs;
+
         # ... and extend it with wanted tests.
         asArgs.extend(asTests);