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

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8394ac4..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
@@ -218,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/' | \
@@ -250,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