diff options
| author | Richard Jones <rjones@centos5x32.home.annexia.org> | 2009-07-07 19:02:59 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@centos5x32.home.annexia.org> | 2009-07-07 19:12:26 +0100 |
| commit | bee76c62d0c1d481cc856c15337ed705e00246ed (patch) | |
| tree | 518e8c804a061dff76424c2907b4ae54e6422d4e /capitests | |
| parent | 291986771c95345daaf28fbcb0c54214b8e6b835 (diff) | |
| download | libguestfs-bee76c62d0c1d481cc856c15337ed705e00246ed.tar.gz libguestfs-bee76c62d0c1d481cc856c15337ed705e00246ed.tar.xz libguestfs-bee76c62d0c1d481cc856c15337ed705e00246ed.zip | |
RHEL 5: Skip 'scrub' test if command is not in the initramfs.
Diffstat (limited to 'capitests')
| -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 7978c9fd..bb931e6a 100644 --- a/capitests/Makefile.am +++ b/capitests/Makefile.am @@ -35,6 +35,8 @@ TESTS_ENVIRONMENT = \ 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. |