On Mon, Sep 14, 2020 at 06:43:27PM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@xxxxxxxxxx> > > mkfs.xfs does not support setting rtinherit on the root directory /and/ > pre-populating the filesystem with protofiles, so don't run this test if > rtinherit is in the mkfs options. > > Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx> > --- Good to me, Reviewed-by: Zorro Lang <zlang@xxxxxxxxxx> > tests/xfs/019 | 5 +++++ > tests/xfs/031 | 5 +++++ > 2 files changed, 10 insertions(+) > > > diff --git a/tests/xfs/019 b/tests/xfs/019 > index f42b62bb..aa5365e7 100755 > --- a/tests/xfs/019 > +++ b/tests/xfs/019 > @@ -51,6 +51,11 @@ _supported_os Linux > > _require_scratch > > +# mkfs cannot create a filesystem with protofiles if realtime is enabled, so > +# don't run this test if the rtinherit is anywhere in the mkfs options. > +echo "$MKFS_OPTIONS" | grep -q "rtinherit" && \ > + _notrun "Cannot mkfs with a protofile and -d rtinherit." > + > protofile=$tmp.proto > tempfile=$tmp.file > > diff --git a/tests/xfs/031 b/tests/xfs/031 > index 6403fd40..671b6727 100755 > --- a/tests/xfs/031 > +++ b/tests/xfs/031 > @@ -81,6 +81,11 @@ _supported_os Linux > _require_scratch > _require_no_large_scratch_dev > > +# mkfs cannot create a filesystem with protofiles if realtime is enabled, so > +# don't run this test if the rtinherit is anywhere in the mkfs options. > +echo "$MKFS_OPTIONS" | grep -q "rtinherit" && \ > + _notrun "Cannot mkfs with a protofile and -d rtinherit." > + > # sanity test - default + one root directory entry > # Note: must do this proto/mkfs now for later inode size calcs > _create_proto 0 >
