Changeset 83479 in vbox for trunk/src/VBox/ValidationKit/testdriver

Timestamp:

Mar 30, 2020 12:56:39 PM (5 years ago)

Author:

vboxsync

Message:

Validation Kit/testdriver: Hack alert: Added sanitizeLogFlagsString() to support more than one log flag as command line argument (--vbox-XXX-log-flags).

File:

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

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

@@ -1055 +1055 @@
         return self.fImportedVBoxApi;
 
+    def sanitizeLogFlagsString(self, sString):
+        """
+        Sanitizes a given log flag string by removing any separators (":" and ",") with
+        a space and removes quotes.
+
+        ## @todo !!! HACK ALERT !!! Needed until we have proper argument parsing / quoting support.
+        """
+        for ch in [ ':', ',' ]:
+            if ch in sString:
+                sString = sString.replace(ch, " ");
+        for ch in [ '\'', '"' ]:
+            if ch in sString:
+                sString = sString.replace(ch, "");
+        return sString;
+
     def _startVBoxSVC(self): # pylint: disable=too-many-statements
         """ Starts VBoxSVC. """
@@ -1065 +1080 @@
         except: pass;
         os.environ['VBOX_LOG']       = self.sLogSvcGroups;
-        os.environ['VBOX_LOG_FLAGS'] = '%s append' % (self.sLogSvcFlags,);  # Append becuse of VBoxXPCOMIPCD.
+        # Append because of VBoxXPCOMIPCD.
+        os.environ['VBOX_LOG_FLAGS'] = '%s append' % (self.sanitizeLogFlagsString(self.sLogSvcFlags),);
         if self.sLogSvcDest:
             os.environ['VBOX_LOG_DEST'] = 'nodeny ' + self.sLogSvcDest;
@@ -1291 +1307 @@
         except: pass;
         os.environ['VBOX_LOG']       = self.sLogSelfGroups;
-        os.environ['VBOX_LOG_FLAGS'] = '%s append' % (self.sLogSelfFlags, );
+        os.environ['VBOX_LOG_FLAGS'] = '%s append' % (self.sanitizeLogFlagsString(self.sLogSelfFlags), );
         if self.sLogSelfDest:
             os.environ['VBOX_LOG_DEST'] = 'nodeny ' + self.sLogSelfDest;
@@ -1811 +1827 @@
             iArg += 1;
             if iArg >= len(asArgs):
-                raise base.InvalidOption('The "--vbox-svc-flags" takes an argument');
+                raise base.InvalidOption('The "--vbox-log-flags" takes an argument');
             self.sLogSelfFlags     = asArgs[iArg];
             self.sLogSessionFlags  = asArgs[iArg];
@@ -2767 +2783 @@
         asEnvFinal = [
             'VBOX_LOG=%s' % (self.sLogSessionGroups,),
-            'VBOX_LOG_FLAGS=%s' % (self.sLogSessionFlags,),
+            'VBOX_LOG_FLAGS=%s' % (self.sanitizeLogFlagsString(self.sLogSessionFlags),),
             'VBOX_LOG_DEST=nodeny %s' % (sLogDest,),
             'VBOX_RELEASE_LOG_FLAGS=append time',