X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=capitests%2FMakefile.am;h=71928ec1cbc8bfd201b0736fb589032ba8d3a564;hp=f061243be5fd9607876a6bdf0d39231ee1914c3e;hb=8ae7e1057f43e9b79260cdf191f39d657fdf0293;hpb=e2206733d1287f5809dbde954f3eb64420471b0d

diff --git a/capitests/Makefile.am b/capitests/Makefile.am
index f061243..71928ec 100644
--- a/capitests/Makefile.am
+++ b/capitests/Makefile.am
@@ -16,9 +16,7 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 EXTRA_DIST = \
-	tests.c \
-	test-cleanup.sh \
-	test-bootbootboot.sh
+	tests.c
 
 # Tests.  These are auto-generated from the test descriptions
 # in the generator.
@@ -26,15 +24,20 @@ EXTRA_DIST = \
 check_PROGRAMS = tests test-command
 
 tests_SOURCES = tests.c
-tests_CFLAGS = \
-	-I$(top_builddir)/src -Wall
+tests_CFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -Wall
 tests_LDADD = $(top_builddir)/src/libguestfs.la
 
-TESTS = tests test-bootbootboot.sh
+TESTS = tests
 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) \
+	SKIP_TEST_NTFS_3G_PROBE=$(shell test -x ../initramfs/bin/ntfs-3g.probe || echo 1) \
+	SKIP_TEST_CHECKSUM_8=$(shell if test `find ../initramfs -name squashfs.ko | wc -l` -eq 0; then echo 1; fi) \
+	SKIP_TEST_MKSWAP_U=$(shell r=1; if test -x ../initramfs/sbin/mkswap; then if ../initramfs/sbin/mkswap --help 2>&1 | grep -sq -- -U; then r=0; fi; fi; echo $$r) \
+	SKIP_TEST_SWAPON_UUID=$$SKIP_TEST_MKSWAP_U \
+	SKIP_TEST_SCRUB_FILE=$(shell test -x ../initramfs/usr/bin/scrub || echo 1) \
+	SKIP_TEST_SCRUB_DEVICE=$(shell test -x ../initramfs/usr/bin/scrub || echo 1) \
 	$(VG)
 
 # Run the tests under valgrind.