Changeset 84482 in vbox for trunk/src/VBox/ValidationKit/testdriver/vbox.py

Timestamp:

May 25, 2020 8:16:03 AM (5 years ago)

Author:

vboxsync

Message:

Validation Kit/testdriver: Added static getGuestWinDir() and make use of it, to avoid more code duplication.

File:

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

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

@@ -2599 +2599 @@
         """
         if oTestVm.isWindows():
-            if oTestVm.sKind in ['WindowsNT4', 'WindowsNT3x',]:
-                return 'C:\\Winnt\\System32';
-            return 'C:\\Windows\\System32';
+            return oTestVm.pathJoin(TestDriver.getGuestWinDir(oTestVm), 'System32');
         if oTestVm.isOS2():
             return 'C:\\OS2\\DLL';
@@ -2617 +2615 @@
         """
         if oTestVm.isWindows():
-            if oTestVm.sKind in ['WindowsNT4', 'WindowsNT3x',]:
-                return 'C:\\Winnt\\System32';
-            return 'C:\\Windows\\System32';
+            return oTestVm.pathJoin(TestDriver.getGuestWinDir(oTestVm), 'System32');
         if oTestVm.isOS2():
             return 'C:\\OS2\\DLL'; ## @todo r=andy Not sure here.
         return sPathPrefix + "/sbin";
+
+    @staticmethod
+    def getGuestWinDir(oTestVm):
+        """
+        Helper for finding the Windows directory in the test VM that we can play around with.
+        ASSUMES that we always install Windows on drive C.
+
+        Returns the Windows directory, or an empty string when executed on a non-Windows guest (asserts).
+        """
+        sWinDir = '';
+        if oTestVm.isWindows():
+            if oTestVm.sKind in ['WindowsNT4', 'WindowsNT3x',]:
+                sWinDir = 'C:/WinNT/';
+            else:
+                sWinDir = 'C:/Windows/';
+        assert sWinDir != '', 'Retrieving Windows directory for non-Windows OS';
+        return sWinDir;
 
     @staticmethod