From: Richard Jones <rjones@centos5x32.home.annexia.org>
Date: Tue, 7 Jul 2009 18:01:45 +0000 (+0100)
Subject: RHEL 5: 'mkswap -U' not supported, check before testing it.
X-Git-Tag: 1.0.56~3
X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=291986771c95345daaf28fbcb0c54214b8e6b835

RHEL 5: 'mkswap -U' not supported, check before testing it.
---

diff --git a/capitests/Makefile.am b/capitests/Makefile.am
index ab91755..7978c9f 100644
--- a/capitests/Makefile.am
+++ b/capitests/Makefile.am
@@ -34,6 +34,7 @@ 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) \
 	$(VG)
 
 # Run the tests under valgrind.