| Message ID | 160013430267.2923511.8202421356162568130.stgit@magnolia (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fstests: tons of random fixes | expand |
On Mon, Sep 14, 2020 at 06:45:02PM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > Modify the mkfs.xfs output so that "realtime =/dev/XXX" becomes > "realtime =external" so that the output will match xfs_db, which doesn't > take a rt device argument and thus does not know. > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > --- Good to me, Reviewed-by: Zorro Lang <zlang@redhat.com> > tests/xfs/449 | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > > diff --git a/tests/xfs/449 b/tests/xfs/449 > index 83c3c493..938dbe28 100755 > --- a/tests/xfs/449 > +++ b/tests/xfs/449 > @@ -46,7 +46,9 @@ cat $tmp.mkfs >> $seqres.full > _scratch_xfs_db -c "info" > $tmp.dbinfo > echo DB >> $seqres.full > cat $tmp.dbinfo >> $seqres.full > -diff -u $tmp.mkfs $tmp.dbinfo > +# xfs_db doesn't take a rtdev argument, so it reports "realtime=external". > +# mkfs does, so make a quick substitution > +diff -u <(cat $tmp.mkfs | sed -e 's/realtime =\/.*extsz=/realtime =external extsz=/g') $tmp.dbinfo > > _scratch_mount > >
On Mon, Sep 14, 2020 at 06:45:02PM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > Modify the mkfs.xfs output so that "realtime =/dev/XXX" becomes > "realtime =external" so that the output will match xfs_db, which doesn't > take a rt device argument and thus does not know. Looks good, Reviewed-by: Christoph Hellwig <hch@lst.de>
diff --git a/tests/xfs/449 b/tests/xfs/449 index 83c3c493..938dbe28 100755 --- a/tests/xfs/449 +++ b/tests/xfs/449 @@ -46,7 +46,9 @@ cat $tmp.mkfs >> $seqres.full _scratch_xfs_db -c "info" > $tmp.dbinfo echo DB >> $seqres.full cat $tmp.dbinfo >> $seqres.full -diff -u $tmp.mkfs $tmp.dbinfo +# xfs_db doesn't take a rtdev argument, so it reports "realtime=external". +# mkfs does, so make a quick substitution +diff -u <(cat $tmp.mkfs | sed -e 's/realtime =\/.*extsz=/realtime =external extsz=/g') $tmp.dbinfo _scratch_mount