From 08557e219c12e573be459407033495899f46967a Mon Sep 17 00:00:00 2001 From: Zheng Liu Date: Fri, 1 Mar 2013 14:17:13 +0000 Subject: [PATCH] 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 Reviewed-by: Eric Sandeen Signed-off-by: Rich Johnston --- common.config | 2 ++ common.defrag | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/common.config b/common.config index e3f9e452..43549699 100644 --- a/common.config +++ b/common.config @@ -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 diff --git a/common.defrag b/common.defrag index 84b1e65b..9c9eb9b1 100644 --- a/common.defrag +++ b/common.defrag @@ -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. -- 2.39.5