Changeset 98962 in vbox

Timestamp:

Mar 14, 2023 1:57:46 PM (23 months ago)

Author:

vboxsync

Message:

ValidationKit/testdriver/vbox.py: VMMR0.r0 might not be present on macOS, especially on arm64. Hopefully fixes detecting the VBox installation on the testbox, bugref:9898

File:

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

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

@@ -488 +488 @@
 
             # Do some checks.
-            sVMMR0 = os.path.join(self.sInstallPath, 'VMMR0.r0');
-            if not os.path.isfile(sVMMR0) and utils.getHostOs() == 'solaris': # solaris is special.
-                sVMMR0 = os.path.join(self.sInstallPath, 'amd64' if utils.getHostArch() == 'amd64' else 'i386', 'VMMR0.r0');
-            if not os.path.isfile(sVMMR0):
-                raise base.GenError('%s is missing' % (sVMMR0,));
+            if utils.getHostOs() != 'darwin': # On macOS VMMR0.r0 might not be present anymore, especially on arm64.
+                sVMMR0 = os.path.join(self.sInstallPath, 'VMMR0.r0');
+                if not os.path.isfile(sVMMR0) and utils.getHostOs() == 'solaris': # solaris is special.
+                    sVMMR0 = os.path.join(self.sInstallPath, 'amd64' if utils.getHostArch() == 'amd64' else 'i386', 'VMMR0.r0');
+                if not os.path.isfile(sVMMR0):
+                    raise base.GenError('%s is missing' % (sVMMR0,));
 
         # Guest additions location is different on windows for some _stupid_ reason.