X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=5c8ff67730dd3dc83c27d3184fd32ca6fa21a2d1;hp=a22360035ce4a1aec3ac1af90a5fe4cb57573479;hb=5d93d70b4d36b2337104b3dbca07722fa4d47ff5;hpb=a3b24296810d98e47552c6838dcd6ab6845aba03;ds=sidebyside

diff --git a/Makefile.am b/Makefile.am
index a223600..5c8ff67 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,7 @@ SUBDIRS += appliance
 endif
 
 # Tests and the test-tool.
-SUBDIRS += gnulib/tests capitests caution regressions test-tool
+SUBDIRS += gnulib/tests tests/c-api tests/qemu regressions extratests test-tool
 
 # Guestfish.
 SUBDIRS += fish
@@ -218,7 +218,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/' | \
@@ -228,6 +228,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
 
@@ -249,6 +250,11 @@ CLEANFILES = \
 quickcheck:
 	./run test-tool/libguestfs-test-tool $(QUICKCHECK_TEST_TOOL_ARGS)
 
+# Run extra-tests in extratests/ subdirectory.
+
+extra-tests:
+	make -C extratests $@
+
 # Make binary distribution.
 
 BINTMPDIR = /tmp/libguestfs-bin