Changeset 105894 in vbox for trunk

Timestamp:

Aug 28, 2024 5:05:42 PM (3 months ago)

Author:

vboxsync

Message:

Validation Kit/tdAddGuestCtrl.py: Try locating the 'sed' binary a bit harder. Needed for OL6 and probably other guests.

File:

• trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py (modified) (1 diff)

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

@@ -1778 +1778 @@
                                         '/v', 'ImagePath', '/t', 'REG_SZ', '/d', sImagePath, '/f'));
             elif oTestVm.isLinux():
-                sPathSed = oTestVm.pathJoin(self.oTstDrv.getGuestSystemDir(oTestVm), 'sed');
-                fRestartVBoxService = self.oTstDrv.txsRunTest(oTxsSession, 'Enabling VBoxService verbose logging', 30 * 1000,
-                                         sPathSed,
-                                        (sPathSed, '-i', '-e', 's/'
-                                         '\\$2 \\$3'
-                                         '/'
-                                         '\\$2 \\$3 -vvvv --logfile \\/var\\/tmp\\/VBoxService\\/VBoxService.log'
-                                         '/g',
-                                         '/sbin/rcvboxadd-service'));
+                # Need to use some stupid trickery here to locate the sed binary,
+                # as this might differ on various Linux hosts, sigh. We also could use 'which' or some sort on the guest.
+                # Note: Sorted by likeliness.
+                asSedPaths = [
+                    '/bin/sed',
+                    '/usr/bin/sed',
+                    '/usr/local/bin/sed'
+                ];
+                fRc, sPathSed = self.locateGstBinary(oTxsSession, asSedPaths);
+                if fRc:
+                    fRestartVBoxService = self.oTstDrv.txsRunTest(oTxsSession, 'Enabling VBoxService verbose logging', 30 * 1000,
+                                             sPathSed,
+                                            (sPathSed, '-i', '-e', 's/'
+                                             '\\$2 \\$3'
+                                             '/'
+                                             '\\$2 \\$3 -vvvv --logfile \\/var\\/tmp\\/VBoxService\\/VBoxService.log'
+                                             '/g',
+                                             '/sbin/rcvboxadd-service'));
             else:
                 reporter.log('Verbose logging for VBoxService not supported for this guest yet');