tests: Rename caution -> tests/qemu.

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a7038f3..eddf4f9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@
 #
 # 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
 
@@ -30,7 +30,7 @@ SUBDIRS += appliance
 endif
 
 # Tests and the test-tool.
-SUBDIRS += gnulib/tests capitests caution regressions test-tool
+SUBDIRS += gnulib/tests capitests tests/qemu regressions extratests test-tool
 
 # Guestfish.
 SUBDIRS += fish
@@ -69,10 +69,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.
@@ -164,6 +161,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 \
@@ -230,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
 
@@ -251,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