From 446f1d8197183302885a5c231189984998d6c77f Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Fri, 5 Apr 2019 10:40:45 -0300 Subject: [PATCH] validate:launcher: Make extra_logfiles a set and fix their names --- validate/launcher/apps/gstvalidate.py | 2 +- validate/launcher/baseclasses.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/validate/launcher/apps/gstvalidate.py b/validate/launcher/apps/gstvalidate.py index 5e2b6e5e34..212745bf62 100644 --- a/validate/launcher/apps/gstvalidate.py +++ b/validate/launcher/apps/gstvalidate.py @@ -691,7 +691,7 @@ class GstValidateBaseRTSPTest: self.rtspserver_logs = sys.stdout else: 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() diff --git a/validate/launcher/baseclasses.py b/validate/launcher/baseclasses.py index 1e510eae8a..1812e3c3b5 100644 --- a/validate/launcher/baseclasses.py +++ b/validate/launcher/baseclasses.py @@ -164,7 +164,7 @@ class Test(Loggable): self.result = Result.NOT_RUN self.logfile = None self.out = None - self.extra_logfiles = [] + self.extra_logfiles = set() self.__env_variable = [] self.kill_subprocess() self.process = None @@ -477,8 +477,8 @@ class Test(Loggable): return args def use_valgrind(self, command, subenv): - vglogsfile = self.logfile + '.valgrind' - self.extra_logfiles.append(vglogsfile) + vglogsfile = os.path.splitext(self.logfile)[0] + '.valgrind' + self.extra_logfiles.add(vglogsfile) vg_args = [] @@ -496,8 +496,8 @@ class Test(Loggable): vg_args.append("--%s=%s" % (o, v)) if not self.options.redirect_logs: - vglogsfile = self.logfile + '.valgrind' - self.extra_logfiles.append(vglogsfile) + vglogsfile = os.path.splitext(self.logfile)[0] + '.valgrind' + self.extra_logfiles.add(vglogsfile) vg_args.append("--%s=%s" % ('log-file', vglogsfile)) for supp in self.get_valgrind_suppressions(): @@ -836,8 +836,8 @@ class GstValidateTest(Test): subproc_env["GST_VALIDATE_UUID"] = self.get_uuid() if 'GST_DEBUG' in os.environ and not self.options.redirect_logs: - gstlogsfile = self.logfile + '.gstdebug' - self.extra_logfiles.append(gstlogsfile) + gstlogsfile = os.path.splitext(self.logfile)[0] + '.gstdebug' + self.extra_logfiles.add(gstlogsfile) subproc_env["GST_DEBUG_FILE"] = gstlogsfile if self.options.no_color: