From patchwork Wed Feb 3 16:02:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 8204751 Return-Path: X-Original-To: patchwork-fstests@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AC239BF0A9 for ; Wed, 3 Feb 2016 16:02:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DCFEF20266 for ; Wed, 3 Feb 2016 16:02:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D188620263 for ; Wed, 3 Feb 2016 16:02:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756345AbcBCQCN (ORCPT ); Wed, 3 Feb 2016 11:02:13 -0500 Received: from casper.infradead.org ([85.118.1.10]:52764 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756009AbcBCQCM (ORCPT ); Wed, 3 Feb 2016 11:02:12 -0500 Received: from chello080109146114.tirol.surfer.at ([80.109.146.114] helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.85 #2 (Red Hat Linux)) id 1aQzsg-00026E-Qo; Wed, 03 Feb 2016 16:02:11 +0000 From: Christoph Hellwig To: darrick.wong@oracle.com Cc: fstests@vger.kernel.org Subject: [PATCH 1/4] xfstests: filter whitespaces in 128 and 132 Date: Wed, 3 Feb 2016 17:02:05 +0100 Message-Id: <1454515328-1586-2-git-send-email-hch@lst.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1454515328-1586-1-git-send-email-hch@lst.de> References: <1454515328-1586-1-git-send-email-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP See http://www.infradead.org/rpr.html Seems either I have a different lsattr version, or different mount points cause differences in the golden output. Send the lsattr output through the whitespaces filter so that it works everywhere. Signed-off-by: Christoph Hellwig --- tests/xfs/128 | 2 +- tests/xfs/128.out | 8 ++++---- tests/xfs/132 | 10 +++++----- tests/xfs/132.out | 40 ++++++++++++++++++++-------------------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/tests/xfs/128 b/tests/xfs/128 index e843e6c..2e1da3f 100755 --- a/tests/xfs/128 +++ b/tests/xfs/128 @@ -97,7 +97,7 @@ c13=$(_md5_checksum "$testdir/file3") c14=$(_md5_checksum "$testdir/file4") echo "Defragment" -lsattr -l "$testdir/" | _filter_scratch +lsattr -l "$testdir/" | _filter_scratch | _filter_spaces xfs_fsr -v -d "$testdir/file1" >> "$seqres.full" xfs_fsr -v -d "$testdir/file2" >> "$seqres.full" # fsr probably breaks the link xfs_fsr -v -d "$testdir/file3" >> "$seqres.full" # fsr probably breaks the link diff --git a/tests/xfs/128.out b/tests/xfs/128.out index 7e72dcd..0ac06db 100644 --- a/tests/xfs/128.out +++ b/tests/xfs/128.out @@ -11,10 +11,10 @@ c650f1cf6c9f07b22e3e21ec7d49ded5 SCRATCH_MNT/test-128/file2 56ed2f712c91e035adeeb26ed105a982 SCRATCH_MNT/test-128/file3 b81534f439aac5c34ce3ed60a03eba70 SCRATCH_MNT/test-128/file4 Defragment -SCRATCH_MNT/test-128/file1 --- -SCRATCH_MNT/test-128/file2 --- -SCRATCH_MNT/test-128/file3 --- -SCRATCH_MNT/test-128/file4 --- +SCRATCH_MNT/test-128/file1 --- +SCRATCH_MNT/test-128/file2 --- +SCRATCH_MNT/test-128/file3 --- +SCRATCH_MNT/test-128/file4 --- b81534f439aac5c34ce3ed60a03eba70 SCRATCH_MNT/test-128/file1 c650f1cf6c9f07b22e3e21ec7d49ded5 SCRATCH_MNT/test-128/file2 56ed2f712c91e035adeeb26ed105a982 SCRATCH_MNT/test-128/file3 diff --git a/tests/xfs/132 b/tests/xfs/132 index 79a6d57..9c57c3b 100755 --- a/tests/xfs/132 +++ b/tests/xfs/132 @@ -87,32 +87,32 @@ for i in `seq 2 $nr`; do done _test_remount free_blocks1=$(stat -f "$testdir" -c '%f') -lsattr -l $testdir/ | _filter_test_dir +lsattr -l $testdir/ | _filter_test_dir | _filter_spaces echo "funshare part of a file" "$XFS_IO_PROG" -f -c "falloc 0 $((sz / 2))" "$testdir/file2" _test_remount -lsattr -l $testdir/ | _filter_test_dir +lsattr -l $testdir/ | _filter_test_dir | _filter_spaces echo "funshare some of the copies" "$XFS_IO_PROG" -f -c "falloc 0 $sz" "$testdir/file2" "$XFS_IO_PROG" -f -c "falloc 0 $sz" "$testdir/file3" _test_remount free_blocks2=$(stat -f "$testdir" -c '%f') -lsattr -l $testdir/ | _filter_test_dir +lsattr -l $testdir/ | _filter_test_dir | _filter_spaces echo "funshare the rest of the files" "$XFS_IO_PROG" -f -c "falloc 0 $sz" "$testdir/file4" "$XFS_IO_PROG" -f -c "falloc 0 $sz" "$testdir/file1" _test_remount free_blocks3=$(stat -f "$testdir" -c '%f') -lsattr -l $testdir/ | _filter_test_dir +lsattr -l $testdir/ | _filter_test_dir | _filter_spaces echo "Rewrite the original file" _pwrite_byte 0x65 0 $sz "$testdir/file1" >> "$seqres.full" _test_remount free_blocks4=$(stat -f "$testdir" -c '%f') -lsattr -l $testdir/ | _filter_test_dir +lsattr -l $testdir/ | _filter_test_dir | _filter_spaces #echo $free_blocks0 $free_blocks1 $free_blocks2 $free_blocks3 $free_blocks4 _within_tolerance "free blocks after reflinking" $free_blocks1 $((free_blocks0 - blks)) $margin -v diff --git a/tests/xfs/132.out b/tests/xfs/132.out index fd2b7bd..f32db7d 100644 --- a/tests/xfs/132.out +++ b/tests/xfs/132.out @@ -1,30 +1,30 @@ QA output created by 132 Create the original file blocks Create the reflink copies -TEST_DIR/test-132/file1 --- -TEST_DIR/test-132/file2 --- -TEST_DIR/test-132/file3 --- -TEST_DIR/test-132/file4 --- +TEST_DIR/test-132/file1 --- +TEST_DIR/test-132/file2 --- +TEST_DIR/test-132/file3 --- +TEST_DIR/test-132/file4 --- funshare part of a file -TEST_DIR/test-132/file1 --- -TEST_DIR/test-132/file2 --- -TEST_DIR/test-132/file3 --- -TEST_DIR/test-132/file4 --- +TEST_DIR/test-132/file1 --- +TEST_DIR/test-132/file2 --- +TEST_DIR/test-132/file3 --- +TEST_DIR/test-132/file4 --- funshare some of the copies -TEST_DIR/test-132/file1 --- -TEST_DIR/test-132/file2 No_COW -TEST_DIR/test-132/file3 No_COW -TEST_DIR/test-132/file4 --- +TEST_DIR/test-132/file1 --- +TEST_DIR/test-132/file2 No_COW +TEST_DIR/test-132/file3 No_COW +TEST_DIR/test-132/file4 --- funshare the rest of the files -TEST_DIR/test-132/file1 No_COW -TEST_DIR/test-132/file2 No_COW -TEST_DIR/test-132/file3 No_COW -TEST_DIR/test-132/file4 No_COW +TEST_DIR/test-132/file1 No_COW +TEST_DIR/test-132/file2 No_COW +TEST_DIR/test-132/file3 No_COW +TEST_DIR/test-132/file4 No_COW Rewrite the original file -TEST_DIR/test-132/file1 No_COW -TEST_DIR/test-132/file2 No_COW -TEST_DIR/test-132/file3 No_COW -TEST_DIR/test-132/file4 No_COW +TEST_DIR/test-132/file1 No_COW +TEST_DIR/test-132/file2 No_COW +TEST_DIR/test-132/file3 No_COW +TEST_DIR/test-132/file4 No_COW free blocks after reflinking is in range free blocks after nocow'ing some copies is in range free blocks after nocow'ing all copies is in range