Changeset 91562 in vbox for trunk/src/VBox

Timestamp:

Oct 5, 2021 10:43:35 AM (3 years ago)

Author:

vboxsync

Message:

Audio/Validation Kit: Implemented ability to run the test driver with a specific audio controller via "--audio-controller-type <HDA|AC97|SB16>". ​bugref:10008

File:

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

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

@@ -154 +154 @@
         elif asArgs[iArg] == '--audio-controller-type':
             iArg += 1;
+            if iArg >= len(asArgs):
+                raise base.InvalidOption('Option "%s" needs a value' % (asArgs[iArg - 1]));
             if not self.importVBoxApi(): # So we can use the constant below.
                 return iArg + 1; # Just skip stuff.
@@ -717 +719 @@
             # Make sure that the VM's audio adapter is configured the way we need it to.
             if self.fpApiVer >= 4.0:
-                if self.enmAudioControllerType:
+                if self.enmAudioControllerType is None:
+                    oOsType = oSession.getOsType();
+                    self.enmAudioControllerType = oOsType.recommendedAudioController;
+                else:
                     reporter.log('Setting user-defined audio controller type to %d' % (self.enmAudioControllerType));
-                    oSession.setupAudio(self.enmAudioControllerType,
-                                        fEnable = True, fEnableIn = True, fEnableOut = True);
-                else:
-                    oOsType = oSession.getOsType();
-                    oSession.setupAudio(oOsType.recommendedAudioController,
-                                        fEnable = True, fEnableIn = True, fEnableOut = True);
+
+                oSession.setupAudio(self.enmAudioControllerType,
+                                    fEnable = True, fEnableIn = True, fEnableOut = True);
 
             # Save the settings.