| Message ID | 1504104706-11965-3-git-send-email-amir73il@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Aug 30, 2017 at 05:51:34PM +0300, Amir Goldstein wrote: > When _require_xfs_io_command is passed command parameters, > the resulting error from invalid parameters may be ignored. > > For example, the following bogus params would not abort the test: > _require_xfs_io_command "falloc" "-X" > _require_xfs_io_command "fiemap" "-X" > > Fix this by looking for the relevant error message. > > Signed-off-by: Amir Goldstein <amir73il@gmail.com> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> > --- > common/rc | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/common/rc b/common/rc > index 9d7b783..44b98f6 100644 > --- a/common/rc > +++ b/common/rc > @@ -2212,9 +2212,14 @@ _require_xfs_io_command() > echo $testio | grep -q "Function not implemented" && \ > _notrun "xfs_io $command support is missing (missing syscall?)" > > - if [ -n "$param" -a $param_checked -eq 0 ]; then > + [ -n "$param" ] || return > + > + if [ $param_checked -eq 0 ]; then > $XFS_IO_PROG -c "help $command" | grep -q "^ $param --" || \ > _notrun "xfs_io $command doesn't support $param" > + else > + echo $testio | grep -q "invalid option" && \ > + _notrun "xfs_io $command doesn't support $param" > fi > } > > -- > 2.7.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/common/rc b/common/rc index 9d7b783..44b98f6 100644 --- a/common/rc +++ b/common/rc @@ -2212,9 +2212,14 @@ _require_xfs_io_command() echo $testio | grep -q "Function not implemented" && \ _notrun "xfs_io $command support is missing (missing syscall?)" - if [ -n "$param" -a $param_checked -eq 0 ]; then + [ -n "$param" ] || return + + if [ $param_checked -eq 0 ]; then $XFS_IO_PROG -c "help $command" | grep -q "^ $param --" || \ _notrun "xfs_io $command doesn't support $param" + else + echo $testio | grep -q "invalid option" && \ + _notrun "xfs_io $command doesn't support $param" fi }
When _require_xfs_io_command is passed command parameters, the resulting error from invalid parameters may be ignored. For example, the following bogus params would not abort the test: _require_xfs_io_command "falloc" "-X" _require_xfs_io_command "fiemap" "-X" Fix this by looking for the relevant error message. Signed-off-by: Amir Goldstein <amir73il@gmail.com> --- common/rc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)