xfs/029: filter out "extended-header: cycle: 1" from output

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

diff --git a/tests/xfs/029 b/tests/xfs/029
index 70c0d10ff804ea18271679582d07451614b2b0af..dbe700ab845e060680e1b8f98f5ecf6fe26752b5 100755 (executable)
--- a/tests/xfs/029
+++ b/tests/xfs/029
@@ -1,28 +1,13 @@
 #! /bin/bash
-# FS QA Test No. 029
-#
-# exercise mkfs log (internal/external) zeroing
-#
-#-----------------------------------------------------------------------
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (c) 2000-2002 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
+# FS QA Test No. 029
 #
-#-----------------------------------------------------------------------
+# exercise mkfs log (internal/external) zeroing
 #
-
 seq=`basename $0`
+seqres=$RESULT_DIR/$seq
 echo "QA output created by $seq"
 
 here=`pwd`
@@ -31,10 +16,10 @@ status=1    # failure is the default
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
-_filter_logprint()
+filter_logprint()
 {
        perl -ne '
            s/data device: ([\w|\/.-]+)/data device: DDEV/;
@@ -46,6 +31,8 @@ _filter_logprint()
             s/(length of Log Record:) \d+/$1 <LEN>/;
             s/version: \d/version: <VERN>/;
            s/h_size: \d+/h_size: <H_SIZE>/;
+           s/^~+[\r|\n]+$//;
+           s/extended-header: cycle: 1[\r|\n]+$//;
            print;
        '
 }
@@ -60,7 +47,7 @@ echo
 _scratch_mkfs_xfs | _filter_mkfs 2>/dev/null
 
 echo
-_scratch_xfs_logprint | _filter_logprint
+_scratch_xfs_logprint | filter_logprint
 
 status=0
 exit