X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=capitests%2FMakefile.am;h=bb931e6ada3ff401e601773f30314e8ea502ae96;hp=ab91755118edf005ddf860dfa961e705dc2fdc94;hb=f8f10578093e926f5f36289a6c11615d067fbcad;hpb=157035503b509385084cafac8e5c5fa0afa2fef7

diff --git a/capitests/Makefile.am b/capitests/Makefile.am
index ab91755..bb931e6 100644
--- a/capitests/Makefile.am
+++ b/capitests/Makefile.am
@@ -34,6 +34,9 @@ TESTS_ENVIRONMENT = \
 	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_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.