tests: Split images -> tests/data + tests/guests

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 115c699..438c522 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ include $(top_srcdir)/subdir-rules.mk
 ACLOCAL_AMFLAGS = -I m4
 
 # Basic source for the library.
-SUBDIRS = gnulib/lib images generator src examples po
+SUBDIRS = gnulib/lib tests/data tests/guests generator src examples po
 
 if ENABLE_DAEMON
 SUBDIRS += daemon
@@ -30,7 +30,10 @@ SUBDIRS += appliance
 endif
 
 # Tests and the test-tool.
-SUBDIRS += gnulib/tests capitests caution regressions test-tool
+SUBDIRS += gnulib/tests tests/c-api tests/qemu
+SUBDIRS += tests/protocol tests/lvm tests/luks tests/md
+SUBDIRS += tests/regressions
+SUBDIRS += tests/extra test-tool
 
 # Guestfish.
 SUBDIRS += fish
@@ -161,6 +164,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 +221,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 +231,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 +253,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