From 02d716d6d8a75f79cddc6c391dfd274ae83334ea Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Tue, 30 May 2017 16:15:19 -0400 Subject: [PATCH] validate:launcher: Handle not redirecting valgrind output --- validate/launcher/baseclasses.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/validate/launcher/baseclasses.py b/validate/launcher/baseclasses.py index 297d14ee33..353591a2b7 100644 --- a/validate/launcher/baseclasses.py +++ b/validate/launcher/baseclasses.py @@ -381,8 +381,6 @@ class Test(Loggable): "--args"] + self.command def use_valgrind(self): - vglogsfile = self.logfile + '.valgrind' - self.extra_logfiles.append(vglogsfile) vg_args = [] @@ -394,11 +392,15 @@ class Test(Loggable): # and all false positives should be added to suppression files. ('errors-for-leak-kinds', 'definite'), ('num-callers', '20'), - ('log-file', vglogsfile), ('error-exitcode', str(VALGRIND_ERROR_CODE)), ('gen-suppressions', 'all')]: vg_args.append("--%s=%s" % (o, v)) + if not self.options.redirect_logs: + vglogsfile = self.logfile + '.valgrind' + self.extra_logfiles.append(vglogsfile) + vg_args.append("--%s=%s" % ('log-file', vglogsfile)) + for supp in self.get_valgrind_suppressions(): vg_args.append("--suppressions=%s" % supp)