Changeset 99490 in vbox

Timestamp:

Apr 20, 2023 3:47:05 PM (20 months ago)

Author:

vboxsync

Message:

Validation Kit/Guest Additions: Added kludge for getting the Guest Additions on tst-rhel5 to install. This ancient test VM has Guest Additions 3.0.14 (pre-)installed already.

Location:

trunk/src/VBox/ValidationKit

Files:

• testdriver/vboxtestvms.py (modified) (1 diff)
• tests/additions/tdAddBasic1.py (modified) (1 diff)

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

@@ -1983 +1983 @@
         #       sKind = 'Ubuntu_64', acCpusSup = range(1, 33), fIoApic = True, sFirmwareType = 'efi',
         #       asParavirtModesSup = [g_ksParavirtProviderKVM,]),
+        # Note: Has ancient Guest Additions 3.0.14 installed already.
         TestVm('tst-rhel5',                 kfGrpSmoke,           sHd = '3.0/tcp/rhel5.vdi',
                sKind = 'RedHat', acCpusSup = range(1, 33), fIoApic = True, sNic0AttachType = 'nat'),

trunk/src/VBox/ValidationKit/tests/additions/tdAddBasic1.py

@@ -511 +511 @@
         # Make sure to add "--nox11" to the makeself wrapper in order to not getting any blocking
         # xterm window spawned.
+        asArgs = [ '--nox11' ];
+
+        # Ugly kludge to make tst-rhel5 (or any other borked test VM) work which (accidentally?) have old(er) Guest Additions
+        # version pre-installed.
+        #
+        # This forces our installer (inside the makeself wrapper, hence the "--") to install, regardless of whether there already
+        # are any (older) Guest Additions installed already.
+        if oTestVm.sVmName == "tst-rhel5":
+            asArgs.extend( [ "--", "--force" ] );
+
         fRc = self.txsRunTest(oTxsSession, 'VBoxLinuxAdditions.run', 30 * 60 * 1000,
                               self.getGuestSystemShell(oTestVm),
                               (self.getGuestSystemShell(oTestVm),
-                              '${CDROM}/%s/VBoxLinuxAdditions.run' % self.sGstPathGaPrefix, '--nox11'));
+                              '${CDROM}/%s/VBoxLinuxAdditions.run' % self.sGstPathGaPrefix, asArgs));
         if fRc and oTxsSession.isSuccess():
             reporter.log('Installation completed');