Re: [PATCH] xfsqa: call _notrun in common.dump if dump utils not found

[Timothy Shimmin <tes@sgi.com>]

Thanks, Eric.

On IRIX:
 > where xfsdump xfsrestore xfsinvutil
/sbin/xfsdump
/usr/sbin/xfsdump
/sbin/xfsrestore
/usr/sbin/xfsinvutil
 > ls -l /sbin/xfsdump
lrwxr-xr-x    ... /sbin/xfsdump -> ../usr/sbin/xfsdump*

I'll add the IRIX xfsrestore path and wait for Russell or
whoever to complain about BSD :)

--Tim

Eric Sandeen wrote:
> it may not always be obvious to outsiders that xfsdump is packaged
> separately from xfsprogs... is it worth checking for the binaries
> rather than spewing verbose failures if it's not installed?
> 
> (and are the locations ok for irix/bsd/whatnot too...?)
> 
> ... also abort if bc not found (common.filter requires this,
> my minimal testing root didn't have it and much error spew
> ensued... nicer to check up front IMHO)
> 
> -Eric
> 
> Index: xfstests/common.dump
> ===================================================================
> --- xfstests.orig/common.dump
> +++ xfstests/common.dump
> @@ -41,6 +41,10 @@ do_quota_check=true # do quota check if 
>  
>  _need_to_be_root
>  
> +[ -x /usr/sbin/xfsdump ] || _notrun "xfsdump executable not found"
> +[ -x /usr/sbin/xfsrestore ] || _notrun "xfsrestore executable not found"
> +[ -x /usr/sbin/xfsinvutil ] || _notrun "xfsinvutil executable not found"
> +
>  # install our cleaner
>  trap "_cleanup; exit \$status" 0 1 2 3 15
>  
> Index: xfstests/common.config
> ===================================================================
> --- xfstests.orig/common.config
> +++ xfstests/common.config
> @@ -114,6 +114,9 @@ export AWK_PROG="`set_prog_path awk`"
>  export SED_PROG="`set_prog_path sed`"
>  [ "$SED_PROG" = "" ] && _fatal "sed not found"
>  
> +export BC_PROG="`set_prog_path bc`"
> +[ "$BC_PROG" = "" ] && _fatal "bc not found"
> +
>  export PS_ALL_FLAGS="-ef"
>  
>  export DF_PROG="`set_prog_path df`"
> 
>