Changeset 98597 in vbox

Timestamp:

Feb 15, 2023 11:05:34 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

155883

Message:

ValKit/tdAdd*.py: There is no sc.exe on NT4 and probably neither on W2K.

File:

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

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

@@ -1604 +1604 @@
         if oTestVm.isWindows():
             sPathSC = os.path.join(self.oTstDrv.getGuestSystemDir(oTestVm), 'sc.exe');
+            if oTestVm.sKind in ('WindowsNT3x', 'WindowsNT4', 'Windows2000',): # W2K too?
+                sPathSC = os.path.join(self.oTstDrv.getGuestSystemDir(oTestVm), 'net.exe');
             if fStart is True:
-                fRc = self.oTstDrv.txsRunTest(oTxsSession, 'Starting VBoxService', 30 * 1000, \
+                fRc = self.oTstDrv.txsRunTest(oTxsSession, 'Starting VBoxService', 30 * 1000,
                                               sPathSC, (sPathSC, 'start', 'VBoxService'));
             else:
-                fRc = self.oTstDrv.txsRunTest(oTxsSession, 'Stopping VBoxService', 30 * 1000, \
+                fRc = self.oTstDrv.txsRunTest(oTxsSession, 'Stopping VBoxService', 30 * 1000,
                                               sPathSC, (sPathSC, 'stop', 'VBoxService'));
         elif oTestVm.isLinux():
             sPathService = "/sbin/rcvboxadd-service";
             if fStart is True:
-                fRc = self.oTstDrv.txsRunTest(oTxsSession, 'Starting VBoxService', 30 * 1000, \
+                fRc = self.oTstDrv.txsRunTest(oTxsSession, 'Starting VBoxService', 30 * 1000,
                                               sPathService, (sPathService, 'start'));
             else:
-                fRc = self.oTstDrv.txsRunTest(oTxsSession, 'Stopping VBoxService', 30 * 1000, \
+                fRc = self.oTstDrv.txsRunTest(oTxsSession, 'Stopping VBoxService', 30 * 1000,
                                               sPathService, (sPathService, 'stop'));
         else:
@@ -1688 +1690 @@
         fEnableVerboseLogging = False;
 
-        # On Windows guests we always can enable verbose logging.
-        if oTestVm.isWindows():
+        # On Windows guests we always can enable verbose logging. NT4 and W2K doesn't have reg.exe nor (at least NT4) sc.exe.
+        if oTestVm.isWindows() and oTestVm.sKind not in ('WindowsNT4', 'Windows2000',):
             fEnableVerboseLogging = True;