From: Richard Jones <rjones@centos5x32.home.annexia.org>
Date: Thu, 2 Jul 2009 23:22:14 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://192.168.122.1/home/rjones/d/libguestfs
X-Git-Tag: 1.0.56~9
X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=6fb57e430c8daa06d8d938ac02a104c8aadbbda5;hp=ee4c49fad5a3e36c6e909ab90bcb7d719c9395b3

Merge branch 'master' of git+ssh://192.168.122.1/home/rjones/d/libguestfs
---

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