Changeset 83736 in vbox for trunk/src/VBox/ValidationKit/tests/additions

Timestamp:

Apr 17, 2020 8:00:48 AM (5 years ago)

Author:

vboxsync

Message:

Validation Kit/Guest Control: Some slash fixes in prepareGuestForTesting() needed for cross-platform testing.

File:

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

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

@@ -1617 +1617 @@
                 return reporter.error('Failed to create directory "%s"!' % (sDir,));
 
+        if oTestVm.isWindows():
+            sGuestSlash = '\\';
+        else:
+            sGuestSlash = '/';
+
         #
         # Enable VBoxService verbose logging.
         #
-        self.oDebug.sVBoxServiceLogPath = os.path.join(self.getGuestTempDir(oTestVm), "VBoxService");
+        self.oDebug.sVBoxServiceLogPath = self.getGuestTempDir(oTestVm) + sGuestSlash + "VBoxService";
         if oTxsSession.syncMkDirPath(self.oDebug.sVBoxServiceLogPath, 0o777) is not True:
             return reporter.error('Failed to create directory "%s"!' % (self.oDebug.sVBoxServiceLogPath,));
@@ -1628 +1633 @@
 
         if oTestVm.isWindows():
-            sPathRegExe         = os.path.join(self.getGuestSystemDir(oTestVm), 'reg.exe');
-            sPathVBoxServiceExe = os.path.join(self.getGuestSystemDir(oTestVm), 'VBoxService.exe');
+            sPathRegExe         = self.getGuestSystemDir(oTestVm) + sGuestSlash + 'reg.exe';
+            sPathVBoxServiceExe = self.getGuestSystemDir(oTestVm) + sGuestSlash + 'VBoxService.exe';
             sImagePath          = '%s -vvvv --logfile %s' % (sPathVBoxServiceExe, sPathLogFile);
             self.oTstDrv.txsRunTest(oTxsSession, 'Enabling VBoxService verbose logging (via registry)', 30 * 1000,