Changeset 101061 in vbox

Timestamp:

Sep 8, 2023 8:05:04 AM (15 months ago)

Author:

vboxsync

Message:

Validation Kit: Build fix for VBox < 7.1. bugref:10384

File:

• trunk/src/VBox/ValidationKit/testdriver/vbox.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/testdriver/vbox.py

@@ -2549 +2549 @@
             return None;
 
-        # Sanity.
-        if   self.fpApiVer < 7.1 \
-        and sPlatformArchitecture != 'x86':  # 7.1 introduced platform support.
+        # Default to x86 if not explicitly specified.
+        if self.fpApiVer >= 7.1:
+            if not sPlatformArchitecture \
+            or     sPlatformArchitecture == 'x86':
+                enmPlatformArchitecture = vboxcon.PlatformArchitecture_x86;
+            elif sPlatformArchitecture == 'ARM':
+                enmPlatformArchitecture = vboxcon.PlatformArchitecture_ARM;
+            else:
+                reporter.error('Unkown platform architecture "%s"' % (sPlatformArchitecture,));
+                return None;
+        elif sPlatformArchitecture != 'x86':  # < 7.1 only has x86 support.
             reporter.errorXcpt('This host version of VirtualBox only supports x86 as platform architecture');
-            return None;
-
-        # Default to x86 if not explicitly specified.
-        if not sPlatformArchitecture \
-        or     sPlatformArchitecture == 'x86':
-            enmPlatformArchitecture = vboxcon.PlatformArchitecture_x86;
-        elif sPlatformArchitecture == 'ARM':
-            enmPlatformArchitecture = vboxcon.PlatformArchitecture_ARM;
-        else:
-            reporter.error('Unkown platform architecture "%s"' % (sPlatformArchitecture,));
             return None;