From bee76c62d0c1d481cc856c15337ed705e00246ed Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Tue, 7 Jul 2009 19:02:59 +0100 Subject: [PATCH] RHEL 5: Skip 'scrub' test if command is not in the initramfs. --- capitests/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/capitests/Makefile.am b/capitests/Makefile.am index 7978c9f..bb931e6 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. -- 1.8.3.1