On Fri, Mar 13, 2015 at 04:51:28PM +0800, Zhaolei wrote:
> From: Zhao Lei <zhaolei@xxxxxxxxxxxxxx>
>
> In generic/019, if we hadn't install fio, we will get following output:
> FSTYP -- btrfs
> PLATFORM -- Linux/x86_64 lenovo 4.0.0-rc3_HEAD_9eccca0843205f87c00404b663188b88eb248051_
> MKFS_OPTIONS -- /dev/sda6
> MOUNT_OPTIONS -- -o context=system_u:object_r:nfs_t:s0 /dev/sda6 /var/ltf/tester/scratch_mnt
>
> generic/019 [not run] utility required, skipped this test <- *
> Not run: generic/019
> Passed all 0 tests
>
> Reason of blank utility name is:
> $1 and $2 are reversed in _require_command(), this patch fixed
> this error.
>
> Signed-off-by: Zhao Lei <zhaolei@xxxxxxxxxxxxxx>
> ---
> common/rc | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/common/rc b/common/rc
> index 1ed9df5..febad8c 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -1276,7 +1276,7 @@ _require_realtime()
> #
> _require_command()
> {
> - [ -n "$1" ] && _cmd="$1" || _cmd="$2"
> + [ -n "$2" ] && _cmd="$2" || _cmd="$1"
> [ -n "$1" -a -x "$1" ] || _notrun "$_cmd utility required, skipped this test"
This doesn't work for me, I tested with generic/299 which requires fio,
$_cmd name was still empty.
I think the right fix is to fix _require_fio()
@@ -2302,7 +2302,7 @@ _require_fio()
{
job=$1
- _require_command $FIO_PROG
+ _require_command $FIO_PROG fio
if [ -z "$1" ]; then
return 1;
fi
There're also some other places need the second arg for _require_command, just grep
_require_command in the source code.
Thanks,
Eryu Guan
> }
>
> --
> 1.8.5.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
