xfstests: use right defrag program path

In _require_defrag defragmentation command path is fixed.  That will
cause that this test case is skipped in some distributions.

Signed-off-by: Zheng Liu <wenqing.lz@taobao.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>
This commit is contained in:
Zheng Liu
2013-03-01 14:17:13 +00:00
committed by Rich Johnston
parent 02e57e1e3a
commit 08557e219c
2 changed files with 7 additions and 5 deletions
+2
View File
@@ -164,6 +164,8 @@ export XFS_COPY_PROG="`set_prog_path xfs_copy`"
export FSTRIM_PROG="`set_prog_path fstrim`"
export DUMPE2FS_PROG="`set_prog_path dumpe2fs`"
export FIO_PROG="`set_prog_path fio`"
export FILEFRAG_PROG="`set_prog_path filefrag`"
export E4DEFRAG_PROG="`set_prog_path e4defrag`"
# Generate a comparable xfsprogs version number in the form of
# major * 10000 + minor * 100 + release
+5 -5
View File
@@ -24,10 +24,10 @@ _require_defrag()
{
case "$FSTYP" in
xfs)
DEFRAG_PROG="`set_prog_path xfs_fsr`"
DEFRAG_PROG="$XFS_FSR_PROG"
;;
ext4|ext4dev)
DEFRAG_PROG="`set_prog_path e4defrag`"
DEFRAG_PROG="$E4DEFRAG_PROG"
;;
btrfs)
DEFRAG_PROG="$BTRFS_UTIL_PROG filesystem defragment"
@@ -38,13 +38,13 @@ _require_defrag()
esac
_require_command $DEFRAG_PROG
_require_command /usr/sbin/filefrag
_require_command $FILEFRAG_PROG
}
_extent_count()
{
filefrag $1 | awk '{print $2}'
filefrag -v $1 >> $seq.full 2>&1
$FILEFRAG_PROG $1 | awk '{print $2}'
$FILEFRAG_PROG -v $1 >> $seq.full 2>&1
}
# Defrag file, check it, and remove it.