X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=capitests%2FMakefile.am;h=023efe4b0d22086301688dc6aee8ec14e21eb391;hb=9160dee922ad0866a3f6245fb1e0ad0b2e90170c;hp=74bfab0c9c1e656219d1dea9cf1555b88b00933d;hpb=c477e2fb78347728aaacbbc89666dcda1481a4b9;p=libguestfs.git

diff --git a/capitests/Makefile.am b/capitests/Makefile.am
index 74bfab0..023efe4 100644
--- a/capitests/Makefile.am
+++ b/capitests/Makefile.am
@@ -33,26 +33,11 @@ tests_CFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src \
   $(WARN_CFLAGS) $(WERROR_CFLAGS)
 tests_LDADD = $(top_builddir)/src/libguestfs.la
 
-# Old version of e2fsprogs which didn't support UUIDs?
-e2fs_uuid_not_supported :=                                              \
-  $(shell r=1;                                                          \
-    test -x ../initramfs/sbin/mkswap                                    \
-      && ../initramfs/sbin/mkswap --help 2>&1 | grep -sq -- -U          \
-      && r=1;                                                           \
-    echo $$r)
-
 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=$(e2fs_uuid_not_supported) \
-	SKIP_TEST_SWAPON_UUID=$(e2fs_uuid_not_supported) \
-	SKIP_TEST_MKE2JOURNAL_U=$(e2fs_uuid_not_supported) \
-	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.