From: Richard W.M. Jones Date: Fri, 2 Dec 2011 15:03:19 +0000 (+0000) Subject: extra tests: Test that valgrind and libtool are installed. X-Git-Tag: 1.14.6~4 X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=eb77965e00365e8c5652264ad569653c82b0de23;p=libguestfs.git extra tests: Test that valgrind and libtool are installed. (cherry picked from commit b7addee24d211014086c44bcef6a0c799e4fb987) --- diff --git a/extratests/Makefile.am b/extratests/Makefile.am index e330e5c..6cc9cb0 100644 --- a/extratests/Makefile.am +++ b/extratests/Makefile.am @@ -22,6 +22,7 @@ # - the disks of these guests are accessible by the current user # (tip: add yourself to the 'disk' group) # - valgrind +# - libtool # # These tests may fail for reasons which aren't necessarily real problems. # @@ -68,6 +69,7 @@ GUESTS = $(shell virsh -c $(LIBVIRT_DEFAULT_URI) list --all | \ awk '{print $$2}') extra-tests: \ + test-prerequisites \ test-capitests \ test-tools-null \ test-tools-internal \ @@ -78,6 +80,16 @@ extra-tests: \ test-resize \ test-sparsify +test-prerequisites: + @libtool --help >/dev/null 2>&1 || { \ + echo "extra-tests: libtool is not installed"; \ + exit 1; \ + } + @valgrind --help >/dev/null 2>&1 || { \ + echo "extra-tests: valgrind is not installed"; \ + exit 1; \ + } + # Null invocations of the basic tools shouldn't leak memory. test-tools-null: $(RUN_VG) ../fish/guestfish -N part exit