X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=53e09108029248d3cabbc5f6332a2218d888956f;hp=17adf1ca09acd03656d59771f9572e127d6067f5;hb=dcd8742578a57e0871d6db4797014bbfd854a57b;hpb=a1e8cdf2a254c5eddaf525cd7c34e4c937690204

diff --git a/Makefile.am b/Makefile.am
index 17adf1c..53e0910 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,8 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src daemon appliance fish po examples images
+SUBDIRS = src daemon appliance fish po examples images \
+	capitests regressions
 
 if HAVE_OCAML
 SUBDIRS += ocaml
@@ -47,7 +48,6 @@ EXTRA_DIST = \
 	guestfish.pod guestfish-actions.pod \
 	html/pod.css \
 	HACKING TODO \
-	tests.c \
 	libguestfs.pc libguestfs.pc.in \
 	gitlog-to-changelog \
 	recipes/LICENSE \
@@ -57,40 +57,11 @@ EXTRA_DIST = \
 	recipes/*.example \
 	html/recipes.css \
 	make-recipes.sh \
-	test-cleanup.sh \
 	contrib/README \
 	contrib/febootstrap/install.title \
 	contrib/febootstrap/install.html \
 	contrib/febootstrap/install.sh \
-	test-bootbootboot.sh
-
-# Tests.  These are auto-generated from the test descriptions
-# in the generator.
-
-check_PROGRAMS = tests test-command
-
-tests_SOURCES = tests.c
-tests_CFLAGS = \
-	-I$(top_builddir)/src -Wall
-tests_LDADD = $(top_builddir)/src/libguestfs.la
-
-TESTS = tests test-bootbootboot.sh
-TESTS_ENVIRONMENT = \
-	SKIP_TEST_COMMAND=$(shell ldd test-command | grep -sq 'not a dynamic executable' || echo 1) \
-	SKIP_TEST_COMMAND_LINES=$(shell ldd test-command | grep -sq 'not a dynamic executable' || echo 1) \
-	SKIP_TEST_ZEROFREE=$(shell test -x initramfs/usr/sbin/zerofree || echo 1) \
-	$(VG)
-
-# Run the tests under valgrind.
-
-valgrind:
-	$(MAKE) check VG="valgrind --quiet --leak-check=full"
-
-# This binary must be statically linked.  It is used for testing
-# the "guestfs_command" and "guestfs_command_lines" functions.
-
-test_command_SOURCES = test-command.c
-test_command_LDFLAGS = -all-static
+	bindtests
 
 # Manual pages.
 # guestfs-actions.pod and guestfs-structs are autogenerated.  There is