xfs/096: filter out the "Discarding..." output

[xfstests-dev.git] / tests / xfs / 096

diff --git a/tests/xfs/096 b/tests/xfs/096
index 2da8fa1842ff3c2cc9638d3af90f59b1c118de2d..04bc7b7dfdaae91e1ca97552555ceddc1eb12e7d 100755 (executable)
--- a/tests/xfs/096
+++ b/tests/xfs/096
@@ -1,28 +1,12 @@
 #! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
+#
 # FS QA Test No. 096
 #
 # test out mkfs_xfs output on IRIX/Linux and some of its error handling
 # ensure pv#920679 is addressed
 #
-#-----------------------------------------------------------------------
-# Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it would be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#
-#-----------------------------------------------------------------------
-#
-
 seqfull=$0
 seq=`basename $0`
 seqres=$RESULT_DIR/$seq
@@ -77,7 +61,7 @@ mkfs_filter()
         -e 's/swidth=[0-9][0-9]* blks$/&, unwritten=1/' \
        -e 's/rtextents=[0-9][0-9]*/rtextents=N/' \
        -e 's/meta-data=[^ ]*/meta-data=DEV/' \
-        -e 's/ *isize/ isize/' \
+        -e 's/ *isize=[0-9]* / isize=N /' \
        -e '/ *= *sectsz=[0-9][0-9]* *attr=[0-9][0-9]*.*$/d' \
        -e '/ *= *mmr=[0-9][0-9]* *$/d' \
        -e 's/ *mixed-case=[YN]//' \
@@ -94,6 +78,7 @@ mkfs_filter()
        -e 's/ ftype=[01]//' \
        -e '/^log stripe unit.*too large/d' \
        -e '/^log stripe unit adjusted/d' \
+       -e '/Discarding/d' \
    | grep -v parent
 }
 
@@ -102,16 +87,17 @@ rm -f $seqres.full
 
 # Modify as appropriate.
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 _require_scratch
 _require_v2log
+_require_xfs_mkfs_without_validation
 
 # choose .out file based on internal/external log
 rm -f $seqfull.out
 if [ "$USE_EXTERNAL" = yes ]; then
-       ln -s $seq.external $seqfull.out
+       ln -s $seq.out.external $seqfull.out
 else
-       ln -s $seq.internal $seqfull.out
+       ln -s $seq.out.internal $seqfull.out
 fi
 
 # maximum log record size
@@ -130,9 +116,9 @@ cat >$tmp.seq.params <<EOF
 # same test but get log stripe from data stripe
   -l version=2 -d su=$big_su,sw=1
 # test out data stripe
-  -l version=1 -d su=$big_su,sw=1
+  -m crc=0 -l version=1 -d su=$big_su,sw=1
 # test out data stripe the same but using sunit & swidth
-  -l version=1 -d sunit=`expr $big_su / 512`,swidth=`expr $big_su / 512`
+  -m crc=0 -l version=1 -d sunit=`expr $big_su / 512`,swidth=`expr $big_su / 512`
 EOF
 
 #