_require_defrag() needs to check if the command is executable, but btrfs has
its subcommand "filesystem defragment", which makes this checking fail.

This workarounds it and now we can run case generic/324, generic/018, btrfs/005.

Signed-off-by: Liu Bo <[email protected]>
---
 common/defrag | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/defrag b/common/defrag
index f923dc0..f36a68b 100644
--- a/common/defrag
+++ b/common/defrag
@@ -37,7 +37,11 @@ _require_defrag()
        ;;
     esac
 
-    _require_command "$DEFRAG_PROG" defragment
+    if [ "$FSTYP" == "btrfs" ]; then
+           _require_command "$BTRFS_UTIL_PROG" defragment
+    else
+           _require_command "$DEFRAG_PROG" defragment
+    fi
     _require_xfs_io_command "fiemap"
 }
 
-- 
1.8.2.1

--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to