Changeset 99462 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Apr 19, 2023 3:50:53 PM (22 months ago)

Author:

vboxsync

Message:

Validation Kit/Shared Folders: Fixes for really old Linux guests (coreutils location).

File:

• trunk/src/VBox/ValidationKit/tests/additions/tdAddSharedFolders1.py (modified) (2 diffs)

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

@@ -308 +308 @@
                     sCopyArgs       = ( sCopy, "/C", "copy", "/Y",  sFsPerfPath, sFsPerfPathTemp );
                 else:
-                    sCopy           = oTestVm.pathJoin(self.oTstDrv.getGuestSystemDir(oTestVm), 'cp');
-                    sCopyArgs       = ( sCopy, "-a", "-v", sFsPerfPath, sFsPerfPathTemp );
+                    # Really old guests (like OL 6) have their coreutils in /bin instead of symlinking /bin to /usr/bin.
+                    if self.oTstDrv.txsIsFile(oSession, oTxsSession, "/bin/cp", fIgnoreErrors = True):
+                        sCopy = "/bin/cp";
+                    else:
+                        sCopy = oTestVm.pathJoin(self.oTstDrv.getGuestSystemDir(oTestVm), 'cp');
+                    sCopyArgs = ( sCopy, "-a", "-v", sFsPerfPath, sFsPerfPathTemp );
                 fRc = self.oTstDrv.txsRunTest(oTxsSession, 'Copying FsPerf', 60 * 1000,
                                               sCopy, sCopyArgs, fCheckSessionStatus = True);
@@ -323 +327 @@
                 if     not oTestVm.isWindows() \
                    and not oTestVm.isOS2():
-                    sCmdLs = oTestVm.pathJoin(self.oTstDrv.getGuestSystemDir(oTestVm), 'ls');
+                    # Really old guests (like OL 6) have their coreutils in /bin instead of symlinking /bin to /usr/bin.
+                    if self.oTstDrv.txsIsFile(oSession, oTxsSession, "/bin/ls", fIgnoreErrors = True):
+                        sCmdLs = "/bin/ls";
+                    else:
+                        sCmdLs = oTestVm.pathJoin(self.oTstDrv.getGuestSystemDir(oTestVm), 'ls');
                     oTxsSession.syncExec(sCmdLs, (sCmdLs, "-al", sFsPerfPath), fIgnoreErrors = True);
                     oTxsSession.syncExec(sCmdLs, (sCmdLs, "-al", "-R", "/opt"), fIgnoreErrors = True);