X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=extratests%2FMakefile.am;h=c08d3dd4428a95bda045f54d690bda6cf5b34f27;hp=3b46ae8be0da4959c13255df259a45f60e50800f;hb=cee513112adcf4084d6be9e3b5037b7b54c9f514;hpb=7708d3e04f6ec3985fd74ee1a44a5615d43065e2

diff --git a/extratests/Makefile.am b/extratests/Makefile.am
index 3b46ae8..c08d3dd 100644
--- a/extratests/Makefile.am
+++ b/extratests/Makefile.am
@@ -43,12 +43,15 @@ GUESTS = $(shell virsh -c $(LIBVIRT_DEFAULT_URI) list --all | \
 		 awk '{print $$2}')
 
 extra-tests: \
+	test-capitests \
 	test-tools-null \
 	test-tools-internal \
-	test-tools-real \
+	test-df-real \
+	test-filesystems-real \
+	test-inspector-real \
+	test-ocaml \
 	test-resize \
-	test-capitests \
-	test-ocaml
+	test-sparsify
 
 # Null invocations of the basic tools shouldn't leak memory.
 test-tools-null:
@@ -82,18 +85,22 @@ test-tools-internal:
 	$(RUN_VG) ../inspector/virt-inspector -a ../images/windows.img >/dev/null
 
 # Invocations of tools on real images shouldn't leak memory.
-test-tools-real:
+test-df-real:
 	$(RUN_VG) virt-df >/dev/null
 	$(RUN_VG) virt-df -h >/dev/null
+
+test-filesystems-real:
 	@for g in $(GUESTS); do \
-	  echo $(RUN_VG) ../inspector/virt-inspector -d $$g; \
-	  $(RUN_VG) ../inspector/virt-inspector -d $$g > /dev/null; \
+	  echo $(RUN_VG) ../cat/virt-filesystems -d $$g --all --long -h --uuid; \
+	  $(RUN_VG) ../cat/virt-filesystems -d $$g --all --long -h --uuid > /dev/null; \
 	  r=$$?; \
 	  if [ $$r -ne 0 ]; then exit $$r; fi; \
 	done
+
+test-inspector-real:
 	@for g in $(GUESTS); do \
-	  echo $(RUN_VG) ../cat/virt-filesystems -d $$g --all --long -h --uuid; \
-	  $(RUN_VG) ../cat/virt-filesystems -d $$g --all --long -h --uuid > /dev/null; \
+	  echo $(RUN_VG) ../inspector/virt-inspector -d $$g; \
+	  $(RUN_VG) ../inspector/virt-inspector -d $$g > /dev/null; \
 	  r=$$?; \
 	  if [ $$r -ne 0 ]; then exit $$r; fi; \
 	done
@@ -102,12 +109,15 @@ test-tools-real:
 test-resize:
 	$(MAKE) -C ../resize VG="$(VG)" check
 
+# Run virt-sparsify tests under valgrind.
+test-sparsify:
+	$(MAKE) -C ../sparsify VG="$(VG)" check
+
 # XXX Not tested:
 # ../clone/virt-sysprep
 # ../edit/virt-edit
 # ../edit/virt-edit -e
 # ../fuse/guestmount
-# ../sparsify/virt-sparsify (OCaml)
 # ../tools/virt-win-reg (Perl)
 # ../tools/virt-make-fs (Perl)