validate:launcher: Handle not redirecting valgrind output

This commit is contained in:
Thibault Saunier 2017-05-30 16:15:19 -04:00
parent dba5675d81
commit 02d716d6d8

View file

@ -381,8 +381,6 @@ class Test(Loggable):
"--args"] + self.command "--args"] + self.command
def use_valgrind(self): def use_valgrind(self):
vglogsfile = self.logfile + '.valgrind'
self.extra_logfiles.append(vglogsfile)
vg_args = [] vg_args = []
@ -394,11 +392,15 @@ class Test(Loggable):
# and all false positives should be added to suppression files. # and all false positives should be added to suppression files.
('errors-for-leak-kinds', 'definite'), ('errors-for-leak-kinds', 'definite'),
('num-callers', '20'), ('num-callers', '20'),
('log-file', vglogsfile),
('error-exitcode', str(VALGRIND_ERROR_CODE)), ('error-exitcode', str(VALGRIND_ERROR_CODE)),
('gen-suppressions', 'all')]: ('gen-suppressions', 'all')]:
vg_args.append("--%s=%s" % (o, v)) 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(): for supp in self.get_valgrind_suppressions():
vg_args.append("--suppressions=%s" % supp) vg_args.append("--suppressions=%s" % supp)