On Sun, Nov 05, 2017 at 04:11:10PM +0800, Eryu Guan wrote: > _scratch_mkfs_sized will create a filesystem of the given size, and > call _notrun and exit if current $FSTYP doesn't support sized mkfs. > But when it's called in a pipe, the exit in _notrun only exits from > the subshell created by the pipe not the test itself, and test > continues to run unnecessarily. > > Fix it by not calling _scratch_mkfs_sized in a pipe, but dumping the > output to a tmp file, which will be fed to _filter_mkfs later. > > Signed-off-by: Eryu Guan <eguan@xxxxxxxxxx> > --- > > This is uncovered by Darrick's patch "generic/204: use available blocks > to determine the number of files to create", with this patch applied > test will 'hang' when testing on a large NFS export, because the number > of files to be created was based on the size of available space. > > Note that I've dropped that patch because it also caused failure in 512B > block size XFS test. > > tests/generic/204 | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tests/generic/204 b/tests/generic/204 > index 4c203a213f5b..ebc9c0fa001b 100755 > --- a/tests/generic/204 > +++ b/tests/generic/204 > @@ -58,8 +58,8 @@ _scratch_mkfs 2> /dev/null | _filter_mkfs 2> $tmp.mkfs > /dev/null > [ $FSTYP = "xfs" ] && MKFS_OPTIONS="$MKFS_OPTIONS -l size=16m -i maxpct=50" > > SIZE=`expr 115 \* 1024 \* 1024` > -_scratch_mkfs_sized $SIZE $dbsize 2> /dev/null \ > - | _filter_mkfs 2> $tmp.mkfs > /dev/null > +_scratch_mkfs_sized $SIZE $dbsize 2> /dev/null > $tmp.mkfs.raw > +cat $tmp.mkfs.raw | _filter_mkfs 2> $tmp.mkfs > /dev/null Looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx> Though xfs/015 seems to employ this same strategy (piped mkfs_sized) so that test needs fixing too, right? --D > _scratch_mount > > # Source $tmp.mkfs to get geometry > -- > 2.13.6 > > -- > To unsubscribe from this list: send the line "unsubscribe fstests" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
