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 <dchinner@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/tests/xfs/096 b/tests/xfs/096
index b2719bc1e9385fce9ac68c8e06d28c9ddb67cefa..0ecf88f842e0856b1679613d149c33ed711d84e6 100755 (executable)
--- 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 9175904132d280d2aa85a46a64bfa13a35514e3d..95833c88d3a1334d9f7be237f6ac904b02ce0ad0 100644 (file)
--- 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 cf75037764bbd281c31943dfbc4e6d105aa052c8..7bf848c07b7504c8277f6ea63c0b0a0f63a0520e 100644 (file)
--- 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