tests: skip without xxd

diff --git a/test/shell/metadata-bad-mdaheader.sh b/test/shell/metadata-bad-mdaheader.sh
index cf24936dbb9c166ee9a91facba61934b2e32c003..e9e303dcdb1cde3b5dede34790404e27cc49e01c 100644 (file)
--- a/test/shell/metadata-bad-mdaheader.sh
+++ b/test/shell/metadata-bad-mdaheader.sh
@@ -12,6 +12,8 @@
 
 . lib/inittest
 
+xxd -v || skip
+
 aux prepare_devs 3
 get_devs
 
@@ -33,8 +35,6 @@ vgcreate $SHARED $vg "$dev1" "$dev2" "$dev3"
 
 pvs
 
-if [ -e "/usr/bin/xxd" ]; then
-
 # read mda_header which is 4k from start of disk
 dd if="$dev1" of=meta1 bs=4k count=1 skip=1
 
@@ -54,8 +54,6 @@ dd if=meta1-bad of="$dev1" bs=4k seek=1
 pvs 2>&1 | tee out
 grep "bad metadata header" out
 
-fi
-
 pvs "$dev1"
 pvs "$dev2"
 pvs "$dev3"

diff --git a/test/shell/metadata-zero-space.sh b/test/shell/metadata-zero-space.sh
index 847ef4475e37e1c19c6803cce0c2df0b5511c775..11c358b4c88668927b0bce2e29e378962575d31c 100644 (file)
--- a/test/shell/metadata-zero-space.sh
+++ b/test/shell/metadata-zero-space.sh
@@ -14,6 +14,8 @@ SKIP_WITH_LVMPOLLD=1
 
 . lib/inittest
 
+xxd -v || skip
+
 aux prepare_devs 1 256
 get_devs
 
@@ -27,8 +29,6 @@ vgcreate $SHARED "$vg" "$dev1"
 
 for i in `seq 1 50`; do lvcreate -l1 -an $vg; done
 
-if [ -e "/usr/bin/xxd" ]; then
-
 # Check metadata copies are separated by zeroes in the first mda
 
 dd if="$dev1" of=meta.raw bs=1M count=1
@@ -81,6 +81,4 @@ cat meta.count | wc -l
 
 test "$(cat meta.count | wc -l)" -gt 20
 
-fi
-
 vgremove -ff $vg