From patchwork Wed Aug 10 15:52:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sterba X-Patchwork-Id: 1054422 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7AFqNmx022546 for ; Wed, 10 Aug 2011 15:52:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751870Ab1HJPwU (ORCPT ); Wed, 10 Aug 2011 11:52:20 -0400 Received: from twin.jikos.cz ([89.185.236.188]:39901 "EHLO twin.jikos.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750922Ab1HJPwT (ORCPT ); Wed, 10 Aug 2011 11:52:19 -0400 Received: from twin.jikos.cz (dave@localhost [127.0.0.1]) by twin.jikos.cz (8.13.6/8.13.6) with ESMTP id p7AFqElI006234 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 10 Aug 2011 17:52:15 +0200 Received: (from dave@localhost) by twin.jikos.cz (8.13.6/8.13.6/Submit) id p7AFqEWE006233; Wed, 10 Aug 2011 17:52:14 +0200 Date: Wed, 10 Aug 2011 17:52:14 +0200 From: David Sterba To: xfs@oss.sgi.com Cc: linux-fsdevel@vger.kernel.org, linux-btrfs@vger.kernel.org, Stefan Behrens Subject: Re: [PATCH v3 1/2] xfstests: make more tests generic Message-ID: <20110810155214.GE20461@twin.jikos.cz> Reply-To: dave@jikos.cz Mail-Followup-To: xfs@oss.sgi.com, linux-fsdevel@vger.kernel.org, linux-btrfs@vger.kernel.org, Stefan Behrens References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 10 Aug 2011 15:52:59 +0000 (UTC) Hi, On Mon, Aug 01, 2011 at 12:31:19PM +0200, Stefan Behrens wrote: > Use _scratch_mkfs / _scratch_mkfs_sized instead of _scratch_mkfs_xfs > where possible. > Execute 015, 062, 083, 117, 120 and 192 for all filesystems, these > tests used to be XFS specific. this patch is now in xfstests-dev and somehow breaks btrfs testing. $ check 015 015 [failed, exit status 1] - output mismatch (see 015.out.bad) *** test out-of-space handling for random write operations -*** done +size=100m mkfs failed +(see 083.full for details) *** unmount checks 117,120,192 passed there's a hardcoded path for mkfs.btrfs in common.rc:_scratch_mkfs_sized() 335 btrfs) 336 /sbin/mkfs.$FSTYP $MKFS_OPTIONS $SCRATCH_DEV -b $fssize 337 ;; I have a /usr/local/ installation of btrfsprogs from git, _scratch_mkfs_sized() was not called for btrfs before. Possible ways to fix this: 1) use /sbin/mkfs -t $FSTYP like _scratch_mkfs, or 2) set $MKFS_BTRFS_PROG like for some other filesystems What is preferred? david > Signed-off-by: Stefan Behrens > --- > 015 | 5 +++-- > 062 | 4 ++-- > 062.out | 6 ------ > 083 | 12 +++++++++--- > 117 | 4 ++-- > 120 | 4 ++-- > 192 | 2 +- > 7 files changed, 19 insertions(+), 18 deletions(-) > > diff --git a/015 b/015 > index 8f2be7c..4206b93 100755 > --- a/015 > +++ b/015 > @@ -48,13 +48,14 @@ _free() > } > > # real QA test starts here > -_supported_fs xfs > +_supported_fs generic > _supported_os IRIX Linux > > _require_scratch > _require_nobigloopfs > > -_scratch_mkfs_xfs -d size=50m >/dev/null || _fail "mkfs failed" > +_scratch_mkfs_sized `expr 50 \* 1024 \* 1024` >/dev/null 2>&1 \ > + || _fail "mkfs failed" > _scratch_mount || _fail "mount failed" > out=$SCRATCH_MNT/fillup.$$ > rm -f $seq.full > diff --git a/062 b/062 > index 5cb6f92..a6e4bc8 100755 > --- a/062 > +++ b/062 > @@ -71,7 +71,7 @@ _create_test_bed() > } > > # real QA test starts here > -_supported_fs xfs udf nfs > +_supported_fs generic > _supported_os Linux > > _require_scratch > @@ -80,7 +80,7 @@ _require_attrs > rm -f $tmp.backup1 $tmp.backup2 $seq.full > > # real QA test starts here > -_scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs > +_scratch_mkfs > /dev/null 2>&1 || _fail "mkfs failed" > _scratch_mount || _fail "mount failed" > _create_test_bed > > diff --git a/062.out b/062.out > index 73fd628..1d5a094 100644 > --- a/062.out > +++ b/062.out > @@ -1,10 +1,4 @@ > QA output created by 062 > -meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks > -data = bsize=XXX blocks=XXX, imaxpct=PCT > - = sunit=XXX swidth=XXX, unwritten=X > -naming =VERN bsize=XXX > -log =LDEV bsize=XXX blocks=XXX > -realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX > *** create test bed > SCRATCH_MNT > SCRATCH_MNT/dev > diff --git a/083 b/083 > index 7342baa..441284e 100755 > --- a/083 > +++ b/083 > @@ -54,7 +54,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > . ./common.filter > > # real QA test starts here > -_supported_fs xfs > +_supported_fs generic > _supported_os IRIX Linux > > _require_scratch > @@ -72,8 +72,14 @@ workout() > umount $SCRATCH_DEV >/dev/null 2>&1 > echo "*** mkfs -dsize=$fsz,agcount=$ags" >>$seq.full > echo "" >>$seq.full > - _scratch_mkfs_xfs -dsize=$fsz,agcount=$ags >>$seq.full 2>&1 \ > - || _fail "size=$fsz,agcount=$ags mkfs failed" > + if [ $FSTYP = xfs ] > + then > + _scratch_mkfs_xfs -dsize=$fsz,agcount=$ags >>$seq.full 2>&1 \ > + || _fail "size=$fsz,agcount=$ags mkfs failed" > + else > + _scratch_mkfs_sized $fsz >>$seq.full 2>&1 \ > + || _fail "size=$fsz mkfs failed" > + fi > _scratch_mount >>$seq.full 2>&1 \ > || _fail "mount failed" > > diff --git a/117 b/117 > index dd880cb..fcf0485 100755 > --- a/117 > +++ b/117 > @@ -51,7 +51,7 @@ _cleanup() > . ./common.attr > > # real QA test starts here > -_supported_fs xfs > +_supported_fs generic > _supported_os IRIX Linux > > _setup_testdir > @@ -62,7 +62,7 @@ rm -f $seq.full > umount $SCRATCH_DEV >/dev/null 2>&1 > echo "*** MKFS ***" >>$seq.full > echo "" >>$seq.full > -_scratch_mkfs_xfs >>$seq.full 2>&1 \ > +_scratch_mkfs >>$seq.full 2>&1 \ > || _fail "mkfs failed" > _scratch_mount >>$seq.full 2>&1 \ > || _fail "mount failed" > diff --git a/120 b/120 > index bf1e617..010a8f3 100755 > --- a/120 > +++ b/120 > @@ -37,11 +37,11 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 > . ./common.filter > > # real QA test starts here > -_supported_fs xfs > +_supported_fs generic > _supported_os Linux IRIX > > _require_scratch > -_scratch_mkfs_xfs >/dev/null 2>&1 > +_scratch_mkfs >/dev/null 2>&1 || _fail "mkfs failed" > > _compare_access_times() > { > diff --git a/192 b/192 > index d8301d5..4b69147 100755 > --- a/192 > +++ b/192 > @@ -45,7 +45,7 @@ _access_time() > > # real QA test starts here > > -_supported_fs xfs udf nfs > +_supported_fs generic > _supported_os Linux > #delay=150 > #delay=75 > -- > 1.7.3.4 > > _______________________________________________ > xfs mailing list > xfs@oss.sgi.com > http://oss.sgi.com/mailman/listinfo/xfs --- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 015.out 2011-02-11 11:42:29.000000000 +0100 +++ 015.out.bad 2011-08-10 17:19:48.000000000 +0200 @@ -1,7 +1,4 @@ QA output created by 015 -fill disk: - !!! disk full (expected) -check free space: -delete fill: -check free space: - !!! free space is in range +mkfs failed +(see 015.full for details) +umount: /mnt/sda10: not mounted $ check 062 --- 062.out 2011-08-10 17:17:23.000000000 +0200 +++ 062.out.bad 2011-08-10 17:20:57.000000000 +0200 @@ -49,10 +49,13 @@ user.name2=0xcafe *** remove attribute -SCRATCH_MNT/reg: user.name2: No such attribute +# file: SCRATCH_MNT/reg +user.name2 + <...long error output...> $ check 083 083 [failed, exit status 1] - output mismatch (see 083.out.bad) --- 083.out 2011-02-11 11:42:30.000000000 +0100 +++ 083.out.bad 2011-08-10 17:21:37.000000000 +0200 @@ -1,4 +1,5 @@ QA output created by 083