From: Zhao Lei <[email protected]> _require_command() only accept 2 arguments but some caller misused this function, and caused "not_run" after we limit calling way.
This patch fixed above caller. Signed-off-by: Zhao Lei <[email protected]> --- common/defrag | 13 +++++++++---- tests/xfs/094 | 2 +- tests/xfs/103 | 2 +- tests/xfs/195 | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/common/defrag b/common/defrag index f923dc0..b44ef98 100644 --- a/common/defrag +++ b/common/defrag @@ -22,22 +22,27 @@ _require_defrag() { + local defrag_cmd + case "$FSTYP" in xfs) - DEFRAG_PROG="$XFS_FSR_PROG" + defrag_cmd="$XFS_FSR_PROG" + DEFRAG_PROG="$defrag_cmd" ;; ext4|ext4dev) - DEFRAG_PROG="$E4DEFRAG_PROG" + defrag_cmd="$E4DEFRAG_PROG" + DEFRAG_PROG="$defrag_cmd" ;; btrfs) - DEFRAG_PROG="$BTRFS_UTIL_PROG filesystem defragment" + defrag_cmd="$BTRFS_UTIL_PROG" + DEFRAG_PROG="defrag_cmd filesystem defragment" ;; *) _notrun "defragmentation not supported for fstype \"$FSTYP\"" ;; esac - _require_command "$DEFRAG_PROG" defragment + _require_command "$defrag_cmd" defragment _require_xfs_io_command "fiemap" } diff --git a/tests/xfs/094 b/tests/xfs/094 index cee42d6..5c6e98d 100755 --- a/tests/xfs/094 +++ b/tests/xfs/094 @@ -46,7 +46,7 @@ _supported_fs xfs _supported_os IRIX Linux _require_realtime _require_scratch -_require_command "$XFS_IO_PROG" xfs_io +[ -n "$XFS_IO_PROG" ] || _notrun "xfs_io executable not found" _filter_realtime_flag() { diff --git a/tests/xfs/103 b/tests/xfs/103 index cbe884f..d80dbf2 100755 --- a/tests/xfs/103 +++ b/tests/xfs/103 @@ -66,7 +66,7 @@ _filter_noymlinks_flag() # real QA test starts here _supported_os Linux IRIX _supported_fs xfs -_require_command "$XFS_IO_PROG" xfs_io +[ -n "$XFS_IO_PROG" ] || _notrun "xfs_io executable not found" _require_scratch _create_scratch diff --git a/tests/xfs/195 b/tests/xfs/195 index 21fcb00..075022d 100755 --- a/tests/xfs/195 +++ b/tests/xfs/195 @@ -65,7 +65,7 @@ _supported_os Linux _require_test _require_user -_require_command "$XFSDUMP_PROG" xfsdump +[ "$XFSDUMP_PROG" = "" ] && _notrun "xfsdump not found" echo "Preparing subtree" mkdir $TEST_DIR/d -- 1.8.5.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
