From c7aa9d3cb0481830131f7570a4619c411240a76b Mon Sep 17 00:00:00 2001 From: Dave Chinner Date: Fri, 12 Dec 2014 10:55:15 +1100 Subject: [PATCH] xfs/096: strip log stripe warnings from mkfs.xfs The warnings have been removed when stripe unit/width are too big for the log stripe unit to be set. Hence add them to the mkfs.xfs filter and strip them from golden output file so the test succeeds on both new and old mfks binaries. Signed-off-by: Dave Chinner Reviewed-by: Brian Foster Signed-off-by: Dave Chinner --- tests/xfs/096 | 4 +++- tests/xfs/096.external | 2 -- tests/xfs/096.internal | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/tests/xfs/096 b/tests/xfs/096 index b2719bc1..0ecf88f8 100755 --- a/tests/xfs/096 +++ b/tests/xfs/096 @@ -88,6 +88,8 @@ _mkfs_filter() -e '/.*crc=/d' \ -e 's/ *$//' \ -e 's/ ftype=[01]//' \ + -e '/^log stripe unit.*too large/d' \ + -e '/^log stripe unit adjusted/d' \ | grep -v parent } @@ -143,7 +145,7 @@ do fi echo "--- mkfs=$mkfs ---" export MKFS_OPTIONS="$mkfs" - _scratch_mkfs_xfs | _mkfs_filter + _scratch_mkfs_xfs 2>&1 | _mkfs_filter echo "" echo "" done diff --git a/tests/xfs/096.external b/tests/xfs/096.external index 91759041..95833c88 100644 --- a/tests/xfs/096.external +++ b/tests/xfs/096.external @@ -7,8 +7,6 @@ log stripe unit (262656) must be a multiple of the block size (4096) # test log stripe greater than LR size --- mkfs=-l version=2,su=266240 --- -log stripe unit (266240 bytes) is too large (maximum is 256KiB) -log stripe unit adjusted to 32KiB meta-data=DEV isize=256 agcount=N, agsize=N blks data = bsize=4096 blocks=N, imaxpct=N = sunit=0 swidth=0 blks, unwritten=1 diff --git a/tests/xfs/096.internal b/tests/xfs/096.internal index cf750377..7bf848c0 100644 --- a/tests/xfs/096.internal +++ b/tests/xfs/096.internal @@ -7,8 +7,6 @@ log stripe unit (262656) must be a multiple of the block size (4096) # test log stripe greater than LR size --- mkfs=-l version=2,su=266240 --- -log stripe unit (266240 bytes) is too large (maximum is 256KiB) -log stripe unit adjusted to 32KiB meta-data=DEV isize=256 agcount=N, agsize=N blks data = bsize=4096 blocks=N, imaxpct=N = sunit=0 swidth=0 blks, unwritten=1 @@ -20,8 +18,6 @@ realtime =REALTIME extsz=N, blocks=N, rtextents=N # same test but get log stripe from data stripe --- mkfs=-l version=2 -d su=266240,sw=1 --- -log stripe unit (266240 bytes) is too large (maximum is 256KiB) -log stripe unit adjusted to 32KiB meta-data=DEV isize=256 agcount=N, agsize=N blks data = bsize=4096 blocks=N, imaxpct=N = sunit=65 swidth=65 blks, unwritten=1 -- 2.39.5