On Fri, Feb 07, 2014 at 09:47:54AM -0800, Christoph Hellwig wrote: > On Wed, Feb 05, 2014 at 07:46:40PM +1100, Dave Chinner wrote: > > From: Dave Chinner <dchinner@xxxxxxxxxx> > > > > Version 5 filesystems always have attr2 format enabled, and it > > cannot be turned off via the noattr2 mount option. As such, attempts > > to mount with noattr2 will be rejected and this causes cascading > > failures within the test. > > > > Hence detect if we've created a CRC enabled filesystem, and if this > > is the case _notrun the test. > > > > Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> > > --- > > tests/xfs/189 | 11 ++++++++++- > > 1 file changed, 10 insertions(+), 1 deletion(-) > > > > diff --git a/tests/xfs/189 b/tests/xfs/189 > > index 27bfb63..addf7ce 100755 > > --- a/tests/xfs/189 > > +++ b/tests/xfs/189 > > @@ -241,7 +241,16 @@ _require_scratch > > unset SCRATCH_RTDEV > > unset SCRATCH_LOGDEV > > > > -_scratch_mkfs_xfs | _filter_mkfs 2>/dev/null > > +_scratch_mkfs_xfs | _filter_mkfs 2> $tmp.mkfs > > + > > +# check to see if we've made a CRC enabled filesystem. If so, > > +# we can't run the test because CRc enabled filesystems don't support > > +# noattr2 mount options and this will cause cascading failures that are > > +# impossible to filter. > > +. $tmp.mkfs > > +if [ $crc -eq 1 ]; then > > + _notrun "Filesystem CRCs enabled, noattr2 is not supported." > > +fi > > I really don't like opencoding this. Shouldn't we instead simplfy > pass a nocrc argument to _scratch_mkfs_xfs? No, that simply breaks old mkfs binaries. > Alternatively this magic should move into a helper. I'll roll it into a _requires_noattr2 helper. Cheers, Dave. -- Dave Chinner david@xxxxxxxxxxxxx _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs
