summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2014-01-06 15:19:31 -0500
committerAllan McRae <allan@archlinux.org>2014-01-28 20:33:57 +1000
commit19b3ee6d39d645368ed50d9a1d40a8aba241c102 (patch)
tree4e989d4f22fed0b9e3c2a0be74af70deca697c02
parentdeaed047fd641f5c09148ea759f57ad91f210c55 (diff)
downloadpacman-19b3ee6d39d645368ed50d9a1d40a8aba241c102.tar.xz
pmtest: send valgrind output to var/log/valgrind
This will allow us to detect whether valgrind found any errors while still preserving pacman's return code for tests. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--test/pacman/pmtest.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py
index 2c50f2a0..e5094a16 100644
--- a/test/pacman/pmtest.py
+++ b/test/pacman/pmtest.py
@@ -220,6 +220,7 @@ class pmtest(object):
cmd.extend(["libtool", "execute", "valgrind", "-q",
"--tool=memcheck", "--leak-check=full",
"--show-reachable=yes",
+ "--log-file=%s" % os.path.join(self.root, "var/log/valgrind"),
"--suppressions=%s" % suppfile])
cmd.extend([pacman["bin"],
"--config", os.path.join(self.root, util.PACCONF),
@@ -231,7 +232,7 @@ class pmtest(object):
if pacman["debug"]:
cmd.append("--debug=%s" % pacman["debug"])
cmd.extend(shlex.split(self.args))
- if not (pacman["gdb"] or pacman["valgrind"] or pacman["nolog"]):
+ if not (pacman["gdb"] or pacman["nolog"]):
output = open(os.path.join(self.root, util.LOGFILE), 'w')
else:
output = None