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

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5170ec8..438c522 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,14 +13,14 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 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
@@ -69,10 +72,7 @@ SUBDIRS += csharp
 
 # virt-resize (new version) and virt-sparsify are written in OCaml.
 if HAVE_OCAML
-if HAVE_OCAML_PCRE
-SUBDIRS += resize
-endif
-SUBDIRS += sparsify
+SUBDIRS += resize sparsify
 endif
 
 # Perl tools.
@@ -85,7 +85,7 @@ if HAVE_FUSE
 SUBDIRS += fuse
 endif
 
-# virt-tools in shell.  This uses guestmount.
+# virt-tools in shell.  This uses guestmount and virt-inspector.
 if HAVE_FUSE
 SUBDIRS += clone
 endif
@@ -102,7 +102,23 @@ EXTRA_DIST = \
        bugs-in-changelog.sh \
        autogen.sh \
        bindtests \
+       contrib/autobuild/autobuild.sh \
+       contrib/guestfsd-in-wine.sh \
+       contrib/intro/libguestfs-intro.html \
+       contrib/intro/overview.svg \
+       contrib/intro/talk.txt \
+       contrib/intro/tools.svg \
        contrib/README \
+       contrib/visualize-alignment/.gitignore \
+       contrib/visualize-alignment/guestfish-add-mount.qtr \
+       contrib/visualize-alignment/guestfish-lv-ext4-4k.qtr \
+       contrib/visualize-alignment/guestfish-lv-ext4-4k-write-hello.qtr \
+       contrib/visualize-alignment/guestfish-N-fs-10M-aligned-part-disk.qtr \
+       contrib/visualize-alignment/guestfish-N-fs-10M.qtr \
+       contrib/visualize-alignment/guestfish-write-hello.qtr \
+       contrib/visualize-alignment/qemu-0.13-trace-block-device-access.patch \
+       contrib/visualize-alignment/README \
+       contrib/visualize-alignment/tracetops.ml \
        debian/.gitignore \
        debian/changelog \
        debian/compat \
@@ -148,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 \
@@ -204,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/' | \
@@ -214,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
 
@@ -235,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