Changeset 79198 in vbox

Timestamp:

Jun 18, 2019 8:44:46 AM (5 years ago)

Author:

vboxsync

Message:

testfileset.py: Preps for using the TestFileSet for the copy-to-guest tests too. bugref:9151 bugref:9320

File:

• trunk/src/VBox/ValidationKit/testdriver/testfileset.py (modified) (2 diffs)

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

@@ -412 +412 @@
         """
 
+        # We only need to flip DOS slashes to unix ones, since windows & OS/2 can handle unix slashes.
+        fDosToUnix = self.fDosStyle and os.path.sep != '\\';
+
         # The directories:
         for oDir in self.aoDirs:
             sPath = oDir.sPath;
             if sAltBase:
-                sPath = sAltBase + sPath[len(self.sBasePath):];
+                if fDosToUnix:
+                    sPath = sAltBase + sPath[len(self.sBasePath):].replace('\\', os.path.sep);
+                else:
+                    sPath = sAltBase + sPath[len(self.sBasePath):];
+            elif fDosToUnix:
+                sPath = sPath.replace('\\', os.path.sep);
 
             try:
@@ -427 +435 @@
             sPath = oFile.sPath;
             if sAltBase:
-                sPath = sAltBase + sPath[len(self.sBasePath):];
+                if fDosToUnix:
+                    sPath = sAltBase + sPath[len(self.sBasePath):].replace('\\', os.path.sep);
+                else:
+                    sPath = sAltBase + sPath[len(self.sBasePath):];
+            elif fDosToUnix:
+                sPath = sPath.replace('\\', os.path.sep);
 
             try: