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

validate:launcher: Make extra_logfiles a set and fix their names

Browse source
This commit is contained in:
Thibault Saunier 2019-04-05 10:40:45 -03:00 committed by Thibault Saunier
parent 2fcdc27c3a
commit 446f1d8197
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
validate/launcher/apps/gstvalidate.py
View file

@ -691,7 +691,7 @@ class GstValidateBaseRTSPTest:
self.rtspserver_logs = sys.stdout self.rtspserver_logs = sys.stdout
else: else:
self.rtspserver_logs = open(self.logfile + '_rtspserver.log', 'w+') self.rtspserver_logs = open(self.logfile + '_rtspserver.log', 'w+')
self.extra_logfiles.append(self.rtspserver_logs.name) self.extra_logfiles.add(self.rtspserver_logs.name)
server_env = os.environ.copy() server_env = os.environ.copy()

14
validate/launcher/baseclasses.py
View file

@ -164,7 +164,7 @@ class Test(Loggable):
self.result = Result.NOT_RUN self.result = Result.NOT_RUN
self.logfile = None self.logfile = None
self.out = None self.out = None
self.extra_logfiles = [] self.extra_logfiles = set()
self.__env_variable = [] self.__env_variable = []
self.kill_subprocess() self.kill_subprocess()
self.process = None self.process = None
@ -477,8 +477,8 @@ class Test(Loggable):
return args return args
def use_valgrind(self, command, subenv): def use_valgrind(self, command, subenv):
vglogsfile = self.logfile + '.valgrind' vglogsfile = os.path.splitext(self.logfile)[0] + '.valgrind'
self.extra_logfiles.append(vglogsfile) self.extra_logfiles.add(vglogsfile)
vg_args = [] vg_args = []
@ -496,8 +496,8 @@ class Test(Loggable):
vg_args.append("--%s=%s" % (o, v)) vg_args.append("--%s=%s" % (o, v))
if not self.options.redirect_logs: if not self.options.redirect_logs:
vglogsfile = self.logfile + '.valgrind' vglogsfile = os.path.splitext(self.logfile)[0] + '.valgrind'
self.extra_logfiles.append(vglogsfile) self.extra_logfiles.add(vglogsfile)
vg_args.append("--%s=%s" % ('log-file', vglogsfile)) vg_args.append("--%s=%s" % ('log-file', vglogsfile))
for supp in self.get_valgrind_suppressions(): for supp in self.get_valgrind_suppressions():
@ -836,8 +836,8 @@ class GstValidateTest(Test):
subproc_env["GST_VALIDATE_UUID"] = self.get_uuid() subproc_env["GST_VALIDATE_UUID"] = self.get_uuid()
if 'GST_DEBUG' in os.environ and not self.options.redirect_logs: if 'GST_DEBUG' in os.environ and not self.options.redirect_logs:
gstlogsfile = self.logfile + '.gstdebug' gstlogsfile = os.path.splitext(self.logfile)[0] + '.gstdebug'
self.extra_logfiles.append(gstlogsfile) self.extra_logfiles.add(gstlogsfile)
subproc_env["GST_DEBUG_FILE"] = gstlogsfile subproc_env["GST_DEBUG_FILE"] = gstlogsfile
if self.options.no_color: if self.options.no_color: