X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.am;h=350c579a6d278afe4b03a1b734e7f6565b037531;hb=be1419a442d9936e737fb2ca6f0fdba36a048964;hp=115c699d3e3200d2d1a66eee1ef80a465acf7a8a;hpb=04ea1375c55aa67df4e7fc61dbb534111767f3b6;p=libguestfs.git

diff --git a/Makefile.am b/Makefile.am
index 115c699..350c579 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,8 +19,11 @@ include $(top_srcdir)/subdir-rules.mk
 
 ACLOCAL_AMFLAGS = -I m4
 
+# Gnulib - must be built and tested before the library.
+SUBDIRS = gnulib/lib gnulib/tests
+
 # Basic source for the library.
-SUBDIRS = gnulib/lib images generator src examples po
+SUBDIRS += tests/data generator src examples po
 
 if ENABLE_DAEMON
 SUBDIRS += daemon
@@ -29,8 +32,21 @@ if ENABLE_APPLIANCE
 SUBDIRS += appliance
 endif
 
-# Tests and the test-tool.
-SUBDIRS += gnulib/tests capitests caution regressions test-tool
+# Tests - order is important.
+SUBDIRS += tests/qemu
+SUBDIRS += tests/guests
+SUBDIRS += tests/c-api
+SUBDIRS += tests/protocol
+SUBDIRS += tests/lvm
+SUBDIRS += tests/luks
+SUBDIRS += tests/md
+SUBDIRS += tests/regressions
+
+# Extra tests don't run by default.  You have to do 'make extra-tests'.
+SUBDIRS += tests/extra
+
+# libguestfs-test-tool
+SUBDIRS += test-tool
 
 # Guestfish.
 SUBDIRS += fish
@@ -161,6 +177,7 @@ HTMLFILES = \
 	html/guestfs-python.3.html \
 	html/guestfs-recipes.1.html \
 	html/guestfs-ruby.3.html \
+	html/guestfs-testing.1.html \
 	html/guestfish.1.html \
 	html/guestmount.1.html \
 	html/virt-alignment-scan.1.html \
@@ -217,7 +234,7 @@ all-local:
 	find $(DIST_SUBDIRS) \
 	    -name '*.c' -o -name '*.pl' -o -name '*.pm' | \
 	grep -v '^perl/blib/' | \
-	grep -v '^capitests/' | \
+	grep -v '^tests/' | \
 	grep -v '^daemon/lib/' | \
 	grep -v '^daemon/tests/' | \
 	grep -v '^examples/' | \
@@ -227,6 +244,7 @@ all-local:
 	grep -v '/rc_protocol.c' | \
 	grep -v 'appliance/debian/root' | \
 	grep -v '^po-docs/' | \
+	grep -v '^images/' | \
 	LC_ALL=C sort | \
 	sed 's,^\./,,' > po/POTFILES.in
 
@@ -248,6 +266,11 @@ CLEANFILES = \
 quickcheck:
 	./run test-tool/libguestfs-test-tool $(QUICKCHECK_TEST_TOOL_ARGS)
 
+# Run extra-tests in tests/extra/ subdirectory.
+
+extra-tests:
+	make -C tests/extra $@
+
 # Make binary distribution.
 
 BINTMPDIR = /tmp/libguestfs-bin