X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=capitests%2FMakefile.am;h=71928ec1cbc8bfd201b0736fb589032ba8d3a564;hp=dd2e5563e405915050dc128dcce68dec52663677;hb=6279c4bbf9cbbe66917ce9ffa4b98eca9040bcd9;hpb=349814e9d912c4f372b8fbdfb10b03749911021f;ds=sidebyside

diff --git a/capitests/Makefile.am b/capitests/Makefile.am
index dd2e556..71928ec 100644
--- a/capitests/Makefile.am
+++ b/capitests/Makefile.am
@@ -33,6 +33,11 @@ TESTS_ENVIRONMENT = \
 	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.