mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-09-02 02:03:54 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate:launcher: Strip env vars in command line outputing verbose

Browse source 
But activate if activating verbosity more than once
This commit is contained in:
Thibault Saunier 2019-06-17 17:59:21 -04:00
parent 4a250437a7
commit a994dd0ca8
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
validate/launcher/baseclasses.py
View file

@ -214,12 +214,15 @@ class Test(Loggable):
@property @property
def _env_variable(self): def _env_variable(self):
res = "" res = ""
for var in set(self.__env_variable): if not self.options.verbose or self.options.verbose > 1:
if res: for var in set(self.__env_variable):
res += " " if res:
value = self.proc_env.get(var, None) res += " "
if value is not None: value = self.proc_env.get(var, None)
res += "%s='%s'" % (var, value) if value is not None:
res += "%s='%s'" % (var, value)
else:
res += "[Not displaying environment variables, rerun with -vv for the full command]"
return res return res

2
validate/launcher/main.py
View file

@ -520,7 +520,7 @@ class LauncherConfig(Loggable):
dir_group.add_argument("-rl", "--redirect-logs", dest="redirect_logs", dir_group.add_argument("-rl", "--redirect-logs", dest="redirect_logs",
help="Redirect logs to 'stdout' or 'sdterr'.") help="Redirect logs to 'stdout' or 'sdterr'.")
dir_group.add_argument("-v", "--verbose", dest="verbose", dir_group.add_argument("-v", "--verbose", dest="verbose",
default=False, action='store_true', action='count',
help="Redirect logs to stdout.") help="Redirect logs to stdout.")
dir_group.add_argument("-j", "--jobs", dest="num_jobs", dir_group.add_argument("-j", "--jobs", dest="num_jobs",
help="Number of tests to execute simultaneously" help="Number of tests to execute simultaneously"