From ac2f9a42fbdacbea4840f9334ed50575f1006089 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 9 Jun 2012 14:47:11 +0100 Subject: btrfs: Modify test to correctly detect btrfs availability. --- tests/btrfs/test-btrfs-devices.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/btrfs/test-btrfs-devices.sh b/tests/btrfs/test-btrfs-devices.sh index fb6beeba..8e014323 100755 --- a/tests/btrfs/test-btrfs-devices.sh +++ b/tests/btrfs/test-btrfs-devices.sh @@ -24,15 +24,17 @@ set -e -# XXX Not a very good test. -if ! btrfs --help >/dev/null 2>&1; then - echo "$0: test skipped because no 'btrfs' utility" +guestfish=../../fish/guestfish + +# If btrfs is not available, bail. +if ! $guestfish -a /dev/null run : available btrfs; then + echo "$0: skipping test because btrfs is not available" exit 0 fi rm -f test[1234].img -../../fish/guestfish <