NO-JIRA: Restore valgrind defaults, smaller values don't save much
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/5f4d852e Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/5f4d852e Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/5f4d852e Branch: refs/heads/master Commit: 5f4d852e19dbebba5d7cde1220c0ff57c3828507 Parents: 790cada Author: Alan Conway <acon...@redhat.com> Authored: Wed Sep 6 12:23:09 2017 -0400 Committer: Alan Conway <acon...@redhat.com> Committed: Wed Sep 6 17:54:44 2017 -0400 ---------------------------------------------------------------------- tools/py/proctest.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/5f4d852e/tools/py/proctest.py ---------------------------------------------------------------------- diff --git a/tools/py/proctest.py b/tools/py/proctest.py index 7a601e5..424cefd 100644 --- a/tools/py/proctest.py +++ b/tools/py/proctest.py @@ -59,11 +59,6 @@ class ProcError(Exception): def __init__(self, proc, what="bad exit status"): self.out = proc.out.strip() returncode = getattr(proc, 'returncode') # Can be missing in some cases - if returncode == proc.valgrind_exit: - self.out = \ - "\n==NOTE== valgrind options set for speed, for more detail run command with" \ - "\n==NOTE== e.g. --leak-check=full --history-level=full --num-callers=40" \ - + self.out msg = "%s (exit=%s) command:\n%s" % (what, returncode, " ".join(proc.args)) if self.out: msg += "\nvvvvvvvvvvvvvvvv\n%s\n^^^^^^^^^^^^^^^^" % self.out @@ -95,12 +90,11 @@ class Proc(Popen): valgrind_exe = valgrind and os.getenv("VALGRIND") if valgrind_exe: # run valgrind for speed, not for detailed information - vg = [valgrind_exe, "--quiet", "--num-callers=2", - "--error-exitcode=%s" % self.valgrind_exit] + vg = [valgrind_exe, "--quiet", "--error-exitcode=%s" % self.valgrind_exit] if helgrind: - vg += ["--tool=helgrind", "--history-level=none"] + vg += ["--tool=helgrind"] else: - vg += ["--tool=memcheck", "--leak-check=full", "--leak-resolution=low"] + vg += ["--tool=memcheck", "--leak-check=full"] self.args = vg + self.args if os.getenv("PROCTEST_VERBOSE"): sys.stderr.write("\n== running == "+" ".join(self.args)+"\n") --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
