Changeset 83525 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Apr 3, 2020 1:24:31 PM (5 years ago)

Author:

vboxsync

Message:

Guest Control/Validation Kit: Added the ability to specify local VBoxService builds to get deployed within using the new "--add-guest-ctrl-debug-img" parameter. Helps for having a quicker turnaround time when debugging stuff.

File:

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

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

@@ -1336 +1336 @@
         self.cNumSessions = cNumSessions;
 
+class tdDebugSettings():
+    """
+    Contains local test debug settings.
+    """
+    def __init__(self, sImgPath = None):
+        self.sImgPath = sImgPath;
 
 class SubTstDrvAddGuestCtrl(base.SubTestDriverBase):
@@ -1347 +1353 @@
         ## @todo base.TestBase.
         self.asTestsDef = [
+            'debug',
             'session_basic', 'session_env', 'session_file_ref', 'session_dir_ref', 'session_proc_ref', 'session_reboot',
             'exec_basic', 'exec_timeout',
@@ -1356 +1363 @@
         self.asTests        = self.asTestsDef;
         self.fSkipKnownBugs = False;
-        self.oTestFiles     = None  # type: vboxtestfileset.TestFileSet
+        self.oTestFiles     = None;  # type: vboxtestfileset.TestFileSet
+        self.oDebug         = tdDebugSettings();
 
     def parseOption(self, asArgs, iArg):                                        # pylint: disable=too-many-branches,too-many-statements
@@ -1377 +1385 @@
             self.fSkipKnownBugs = False;
             return iArg + 1;
+        if asArgs[iArg] == '--add-guest-ctrl-debug-img':
+            iArg += 1;
+            iNext = self.oTstDrv.requireMoreArgs(1, asArgs, iArg);
+            self.oDebug.sImgPath = asArgs[iArg];
+            return iNext;
         return iArg;
 
@@ -1385 +1398 @@
         reporter.log('  --add-guest-ctrl-skip-known-bugs');
         reporter.log('      Skips known bugs.  Default: --no-add-guest-ctrl-skip-known-bugs');
+        reporter.log('Debugging:');
+        reporter.log('  --add-guest-ctrl-debug-img');
+        reporter.log('      Sets VBoxService image to deploy for debugging');
         return True;
 
@@ -1398 +1414 @@
         atTests = [
             ( True,  self.prepareGuestForTesting,           None,               'Preparations',),
+            ( True,  self.prepareGuestForDebugging,         None,               'Manaul Debugging',),
             ( True,  self.testGuestCtrlSession,             'session_basic',    'Session Basics',),
             ( True,  self.testGuestCtrlExec,                'exec_basic',       'Execution',),
@@ -1505 +1522 @@
             return SubTstDrvAddGuestCtrl.getGuestSystemDir(oTestVm) + '\\DOSCALL1.DLL';
         return "/bin/sh";
+
+    def prepareGuestForDebugging(self, oSession, oTxsSession, oTestVm):
+        """
+        Prepares a guest for (manual) debugging.
+
+        This involves copying over and invoking a the locally built VBoxService binary.
+        """
+
+        if self.oDebug.sImgPath is None: # If no debugging enabled, bail out.
+            return True
+
+        reporter.log('Preparing for debugging ...');
+
+        try:
+
+            if oTestVm.isLinux():
+                reporter.log('Uploading %s ...' % self.oDebug.sImgPath);
+                sFileVBoxServiceHst = self.oDebug.sImgPath;
+                sFileVBoxServiceGst = "/tmp/VBoxService-txs";
+                oTxsSession.syncUploadFile(sFileVBoxServiceHst, sFileVBoxServiceGst);
+                oTxsSession.syncExec("/bin/chmod", ("/bin/chmod", "755", sFileVBoxServiceGst) ); # syncChMod not implemented yet.
+                reporter.log('Executing VBoxService (in background)...');
+                oTxsSession.syncExec(sFileVBoxServiceGst, (sFileVBoxServiceGst, "-vvvv", "--only-control", \
+                                                           "--logfile", "/tmp/VBoxService-txs.log") );
+            else: ## @todo Implement others.
+                return reporter.errorXcpt('Debugging not available on this guest OS yet');
+
+        except:
+            return reporter.errorXcpt('Unable to prepare for debugging');
+
+        return True;
 
     #