Changeset 107173 in vbox

Timestamp:

Nov 28, 2024 12:23:48 PM (7 weeks ago)

Author:

vboxsync

Message:

ValidationKit/tests/additions/tdAddGuestCtrl.py: Added support for VBoxService logging on NT4 / W2K guests by using VBoxGuestInstallHelper.exe as registry editor by default.

File:

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

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

@@ -1730 +1730 @@
         fEnableVerboseLogging = False;
 
-        # On Windows and Linux 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',)) \
-        or oTestVm.isLinux():
+        # On Windows and Linux guests we always can (try to) enable verbose logging.
+        if (oTestVm.isWindows() or oTestVm.isLinux()):
             fEnableVerboseLogging = True;
 
@@ -1742 +1740 @@
             fEnableVerboseLogging = False;
 
+        self.oDebug.sGstVBoxServiceLogPath = oTestVm.pathJoin(self.oTstDrv.getGuestTempDir(oTestVm), "VBoxService");
+        sPathLogFile = oTestVm.pathJoin(self.oDebug.sGstVBoxServiceLogPath, 'VBoxService.log');
+
+        if oTestVm.isWindows():
+            sImagePath = '%s -vvvv --logfile %s' % (self.sPathVBoxServiceExeGst, sPathLogFile);
+            # For newer revisions we use VBoxGuestInstallHelper.exe. Should work on all Windows versions.
+            if self.oTstDrv.fpApiVer >= 7.0 and self.oTstDrv.uRevision >= 166162:
+                # Right now we ASSUME that the installation directory always is the following:
+                sRegEditorExePath     = 'C:\\Program Files\\Oracle\\VirtualBox Guest Additions\\VBoxGuestInstallHelper.exe';
+                asRegEditorArgs       = [ sRegEditorExePath, 'registry', 'write', 'HKLM', 'SYSTEM\\CurrentControlSet\\Services\\VBoxService',
+                                          'ImagePath', 'REG_SZ', '"' + sImagePath + '"' ];
+            # reg.exe is not able to write keys on older Windows versions (NT4, 2k).
+            elif oTestVm.sKind not in ('WindowsNT4', 'Windows2000',):
+                sRegEditorExePath     = oTestVm.pathJoin(self.oTstDrv.getGuestSystemDir(oTestVm), 'reg.exe');
+                asRegEditorArgs       = [ sRegEditorExePath, 'add', 'HKLM\\SYSTEM\\CurrentControlSet\\Services\\VBoxService',
+                                          '/v', 'ImagePath', '/t', 'REG_SZ', '/d', sImagePath, '/f' ];
+            else:
+                reporter.log('VBoxService logging is not available on this Windows guest');
+                fEnableVerboseLogging = False;
+
         # Some older Linux test VMs (like tst-rhel5) don't have a pre-configured 'vbox' user.
         # So make sure that this user exists and has the appropriate password set. Ignore any errors.
-        if oTestVm.isLinux():
+        elif oTestVm.isLinux():
             sCmdUserAdd = oTestVm.pathJoin(self.oTstDrv.getGuestSystemAdminDir(oTestVm, sPathPrefix = '/usr'), 'useradd');
             asArgs = [ sCmdUserAdd, '-m', 'vbox' ];
@@ -1760 +1778 @@
         reporter.log('Enabling verbose VBoxService logging: %s' % (fEnableVerboseLogging));
         if fEnableVerboseLogging:
-            self.oDebug.sGstVBoxServiceLogPath = oTestVm.pathJoin(self.oTstDrv.getGuestTempDir(oTestVm), "VBoxService");
             if oTxsSession.syncMkDirPath(self.oDebug.sGstVBoxServiceLogPath, 0o777) is not True:
                 return reporter.error('Failed to create directory "%s"!' % (self.oDebug.sGstVBoxServiceLogPath,));
-            sPathLogFile = oTestVm.pathJoin(self.oDebug.sGstVBoxServiceLogPath, 'VBoxService.log');
-
             reporter.log('VBoxService logs will be stored in "%s"' % (self.oDebug.sGstVBoxServiceLogPath,));
 
             fRestartVBoxService = False;
-            if oTestVm.isWindows() and oTestVm.sKind not in ('WindowsNT4', 'Windows2000',):
-                sPathRegExe         = oTestVm.pathJoin(self.oTstDrv.getGuestSystemDir(oTestVm), 'reg.exe');
-                sImagePath          = '%s -vvvv --logfile %s' % (self.sPathVBoxServiceExeGst, sPathLogFile);
+
+            if oTestVm.isWindows():
+                asArgs = [ sRegEditorExePath ] + asRegEditorArgs;
                 fRestartVBoxService = self.oTstDrv.txsRunTest(oTxsSession, 'Enabling VBoxService verbose logging (via registry)',
-                                         30 * 1000,
-                                         sPathRegExe,
-                                        (sPathRegExe, 'add',
-                                        'HKLM\\SYSTEM\\CurrentControlSet\\Services\\VBoxService',
-                                        '/v', 'ImagePath', '/t', 'REG_SZ', '/d', sImagePath, '/f'));
+                                                              30 * 1000,
+                                                              sRegEditorExePath, asRegEditorArgs);
             elif oTestVm.isLinux():
                 # Need to use some stupid trickery here to locate the sed binary,