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

Timestamp:

Jan 24, 2023 9:48:36 AM (23 months ago)

Author:

vboxsync

Message:

Validation Kit/testdriver: Added a new option "--vbox-vm-no-terminate" that leaves the current VM up and running after a test driver run. This is handy to have for manual investigation work during test driver development and should get rid of the custom hacks (some) test drivers have to perform the same result.

File:

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

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

@@ -905 +905 @@
         self.fAlwaysUploadRecordings  = False; # Only upload recording files on failure by default.
         self.fEnableDebugger          = True;
+        self.fVmNoTerminate           = False; # Whether to skip exit handling and tearing down the VMs.
         self.adRecordingFiles         = [];
         self.fRecordingEnabled        = False; # Don't record by default (yet).
@@ -1830 +1831 @@
         reporter.log('      Explicitly specify 0 for unlimited size.');
         reporter.log('      Default: 195 MB.');
+        reporter.log('  --vbox-vm-no-terminate');
+        reporter.log('      Does not terminate the test VM after running the test driver.');
         if self.oTestVmSet is not None:
             self.oTestVmSet.showUsage();
@@ -1960 +1963 @@
                 raise base.InvalidOption('The "--vbox-recording-max-file-size" takes an argument');
             self.cMbRecordingMax = int(asArgs[iArg]);
+        elif asArgs[iArg] == '--vbox-vm-no-terminate':
+            self.fVmNoTerminate = True;
         else:
             # Relevant for selecting VMs to test?
@@ -2083 +2088 @@
         Stop VBoxSVC if we've started it.
         """
-        if self.oVBoxSvcProcess is not None:
+        if  not self.fVmNoTerminate \
+        and self.oVBoxSvcProcess is not None:
             reporter.log('*** Shutting down the VBox API... (iRc=%s)' % (iRc,));
             self._powerOffAllVms();
@@ -3285 +3291 @@
         kill the VM process.
         """
+
         reporter.log2('terminateVmBySession: oSession=%s (pid=%s) oProgress=%s' % (oSession.sName, oSession.getPid(), oProgress));
+
+        if self.fVmNoTerminate:
+            reporter.log('terminateVmBySession: Skipping, as --vbox-vm-no-terminate was specified');
+            # Make sure that we still process the events the VM needs.
+            self.sleep(24 * 60 * 60 * 1000);
 
         # Call getPid first to make sure the PID is cached in the wrapper.