Changeset 83500 in vbox for trunk/src

Timestamp:

Apr 1, 2020 11:13:00 AM (5 years ago)

Author:

vboxsync

Message:

ValKit/vbox.py: Reverted r136720 (Hack alert: Added sanitizeLogFlagsString() to support more than one log flag as command line argument (--vbox-XXXX-log-flags).)

File:

• trunk/src/VBox/ValidationKit/testdriver/vbox.py (modified) (6 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. """
@@ -1080 +1065 @@
         except: pass;
         os.environ['VBOX_LOG']       = self.sLogSvcGroups;
-        # Append because of VBoxXPCOMIPCD.
-        os.environ['VBOX_LOG_FLAGS'] = '%s append' % (self.sanitizeLogFlagsString(self.sLogSvcFlags),);
+        os.environ['VBOX_LOG_FLAGS'] = '%s append' % (self.sLogSvcFlags,);  # Append becuse of VBoxXPCOMIPCD.
         if self.sLogSvcDest:
             os.environ['VBOX_LOG_DEST'] = 'nodeny ' + self.sLogSvcDest;
@@ -1307 +1291 @@
         except: pass;
         os.environ['VBOX_LOG']       = self.sLogSelfGroups;
-        os.environ['VBOX_LOG_FLAGS'] = '%s append' % (self.sanitizeLogFlagsString(self.sLogSelfFlags), );
+        os.environ['VBOX_LOG_FLAGS'] = '%s append' % (self.sLogSelfFlags, );
         if self.sLogSelfDest:
             os.environ['VBOX_LOG_DEST'] = 'nodeny ' + self.sLogSelfDest;
@@ -1782 +1766 @@
                 raise base.InvalidOption('The "--vbox-self-log-flags" takes an argument');
             self.sLogSelfFlags = asArgs[iArg];
+            print('self.sLogSelfFlags="%s"' % (self.sLogSelfFlags,))
         elif asArgs[iArg] == '--vbox-self-log-dest':
             iArg += 1;
@@ -1827 +1812 @@
             iArg += 1;
             if iArg >= len(asArgs):
-                raise base.InvalidOption('The "--vbox-log-flags" takes an argument');
+                raise base.InvalidOption('The "--vbox-svc-flags" takes an argument');
             self.sLogSelfFlags     = asArgs[iArg];
             self.sLogSessionFlags  = asArgs[iArg];
@@ -2783 +2768 @@
         asEnvFinal = [
             'VBOX_LOG=%s' % (self.sLogSessionGroups,),
-            'VBOX_LOG_FLAGS=%s' % (self.sanitizeLogFlagsString(self.sLogSessionFlags),),
+            'VBOX_LOG_FLAGS=%s' % (self.sLogSessionFlags,),
             'VBOX_LOG_DEST=nodeny %s' % (sLogDest,),
             'VBOX_RELEASE_LOG_FLAGS=append time',