Index: /trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py
===================================================================
--- /trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py	(revision 83587)
+++ /trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py	(revision 83588)
@@ -1342,4 +1342,5 @@
     def __init__(self, sImgPath = None):
         self.sImgPath = sImgPath;
+        self.fNoExit = False;
 
 class SubTstDrvAddGuestCtrl(base.SubTestDriverBase):
@@ -1390,4 +1391,7 @@
             self.oDebug.sImgPath = asArgs[iArg];
             return iNext;
+        if asArgs[iArg] == '--add-guest-ctrl-debug-no-exit':
+            self.oDebug.fNoExit = True;
+            return iArg + 1;
         return iArg;
 
@@ -1401,4 +1405,6 @@
         reporter.log('  --add-guest-ctrl-debug-img');
         reporter.log('      Sets VBoxService image to deploy for debugging');
+        reporter.log('  --add-guest-ctrl-debug-no-exit');
+        reporter.log('      Does not tear down and exit the test driver after running the tests');
         return True;
 
@@ -4925,17 +4931,18 @@
             self.addTask(oTxsSession);
 
-            fManual = False; # Manual override for local testing. (Committed version shall be False.)
-            if not fManual:
-                fRc, oTxsSession = self.aoSubTstDrvs[0].testIt(oTestVm, oSession, oTxsSession);
-            else:
-                fRc, oTxsSession = self.testGuestCtrlManual(oSession, oTxsSession, oTestVm);
+            fRc, oTxsSession = self.aoSubTstDrvs[0].testIt(oTestVm, oSession, oTxsSession);
 
             # Cleanup.
             self.removeTask(oTxsSession);
-            if not fManual:
+            if not self.aoSubTstDrvs[0].oDebug.fNoExit:
                 self.terminateVmBySession(oSession);
         else:
             fRc = False;
         return fRc;
+
+    def onExit(self, iRc):
+        if self.aoSubTstDrvs[0].oDebug.fNoExit:
+            return True
+        return vbox.TestDriver.onExit(self, iRc);
 
     def gctrlReportError(self, progress):