From 19b8298ce88564e38683279664400572ce285f2e Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Tue, 18 Sep 2012 01:29:08 +1000 Subject: [PATCH] pactest: allow running with valgrind from any directory When using the --valgrind flag with the pactest.py script, the path to the suppression file relies on the script being called from the source root directory. Construct the path from the scripts location to allow it to be called from directory. Dan: style cleanup. Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- test/pacman/pmtest.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index 4e1ecd0b..5f0692f8 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -203,9 +203,12 @@ class pmtest(object): if pacman["gdb"]: cmd.extend(["libtool", "execute", "gdb", "--args"]) if pacman["valgrind"]: + suppfile = os.path.join(os.path.dirname(__file__), + '..', '..', 'valgrind.supp') cmd.extend(["libtool", "execute", "valgrind", "-q", "--tool=memcheck", "--leak-check=full", - "--show-reachable=yes", "--suppressions=%s/valgrind.supp" % os.getcwd()]) + "--show-reachable=yes", + "--suppressions=%s" % suppfile]) cmd.extend([pacman["bin"], "--config", os.path.join(self.root, util.PACCONF), "--root", self.root,