diff options
| author | Richard Jones <rjones@centos5x32.home.annexia.org> | 2009-06-10 14:32:59 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@centos5x32.home.annexia.org> | 2009-06-10 14:32:59 +0100 |
| commit | 908aaf4bb0727831377547a64a4f680dafb6b221 (patch) | |
| tree | 25c663c8d64a2e9113bbf0381155c57d673645be | |
| parent | 8224bfd0020ee9e2cb6c58c8d1b8eeba3028e943 (diff) | |
| parent | dc3b5a7a52fd1a53ba482042fcfb8c4b0bf83b09 (diff) | |
| download | libguestfs-908aaf4bb0727831377547a64a4f680dafb6b221.tar.gz libguestfs-908aaf4bb0727831377547a64a4f680dafb6b221.tar.xz libguestfs-908aaf4bb0727831377547a64a4f680dafb6b221.zip | |
Merge branch 'master' of git+ssh://192.168.2.134/home/rjones/d/libguestfs
| -rw-r--r-- | capitests/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/capitests/Makefile.am b/capitests/Makefile.am index 18e49a3f..b52d2ed7 100644 --- a/capitests/Makefile.am +++ b/capitests/Makefile.am @@ -33,6 +33,8 @@ 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) \ $(VG) # Run the tests under valgrind. |