diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2012-11-12 18:13:37 +0000 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-11-13 15:26:29 +0000 |
| commit | 765d14dc0551b2c05d6a846aa6701055b080180c (patch) | |
| tree | e27a803a30377db06f0c65e6e348ebd30d66b18d | |
| parent | ab360c48d4bf6ddb3f14c0f2434e235dfea3a184 (diff) | |
| download | libguestfs-765d14dc0551b2c05d6a846aa6701055b080180c.tar.gz libguestfs-765d14dc0551b2c05d6a846aa6701055b080180c.tar.xz libguestfs-765d14dc0551b2c05d6a846aa6701055b080180c.zip | |
Define whole valgrind command (as @VG@) in the configure script.
This is mostly just code motion, but it also changes the default
location where valgrind.log is written to be the top build directory
(instead of tests/extra/valgrind.log).
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | tests/extra/Makefile.am | 7 |
3 files changed, 7 insertions, 7 deletions
@@ -429,4 +429,4 @@ Makefile.in /tools/test.img /tools/virt-*.1 /tools/virt-*.pl -/valgrind.log.* +/valgrind.log* diff --git a/configure.ac b/configure.ac index 88772605..0d582faa 100644 --- a/configure.ac +++ b/configure.ac @@ -784,6 +784,11 @@ AS_IF([test "x$VALGRIND" != "xno"],[ AC_MSG_RESULT([no]) AC_SUBST([VALGRIND_NO_VGDB],[]) fi + + # Substitute the whole valgrind command. + VG='$(VALGRIND) $(VALGRIND_NO_VGDB) --log-file=$(abs_top_builddir)/valgrind.log --leak-check=full --error-exitcode=119 --suppressions=$(abs_top_srcdir)/valgrind-suppressions' + AC_SUBST([VG]) + AM_SUBST_NOTMAKE([VG]) ]) dnl Check for OCaml (optional, for OCaml bindings and OCaml tools). diff --git a/tests/extra/Makefile.am b/tests/extra/Makefile.am index d171efe2..e5458478 100644 --- a/tests/extra/Makefile.am +++ b/tests/extra/Makefile.am @@ -63,12 +63,7 @@ EXTRA_DIST = \ test-with-upstream-libvirt.sh \ test-with-upstream-qemu.sh -VG = $(VALGRIND) \ - $(VALGRIND_NO_VGDB) \ - --log-file=$(abs_builddir)/valgrind.log \ - --leak-check=full \ - --error-exitcode=119 \ - --suppressions=$(abs_top_srcdir)/valgrind-suppressions +VG = @VG@ RUN_VG = $(abs_top_builddir)/run $(VG) libvirt_uri = qemu+unix:///system?socket=/var/run/libvirt/libvirt-sock-ro |