From: Boris Ranto Date: Thu, 18 Nov 2010 02:44:57 +0000 (-0600) Subject: xfstests 223: reinitialize MKFS_OPTIONS X-Git-Tag: v1.1.0~112 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a9f5ef25fb2e6d66c43441fb0d2277ce62d1d2e3;p=xfstests-dev.git xfstests 223: reinitialize MKFS_OPTIONS Test case 223 constantly fails because the variable carrying mkfs options is not being reinitialized. Test calls function _scratch_mkfs_geom repeatedly in for loop without cleaning the MKFS_OPTIONS variable. Since _scratch_mkfs_geom only appends options to the variable, MKFS_OPTIONS looks like this in 5th iteration: MKFS_OPTIONS="-bsize=4096-b size=4096 -d su=8192,sw=4-b size=4096 -d su=16384,sw=4-b size=4096 -d su=32768,sw=4-b size=4096 -d su=65536,sw=4-b size=4096 -d su=131072,sw=4" It is also easy to see that _scratch_mkfs_geom does not append leading space when it appends the variable. Following patch fixes the issue for me and based on my testing does not break any other test case: Signed-off-by: Boris Ranto Signed-off-by: Eric Sandeen Reviewed-by: Eric Sandeen --- diff --git a/223 b/223 index cf498ae4..2e0a2451 100755 --- a/223 +++ b/223 @@ -58,6 +58,7 @@ for SUNIT_K in 8 16 32 64 128; do let SUNIT_BLOCKS=$SUNIT_BYTES/$BLOCKSIZE echo "=== mkfs with su $SUNIT_BLOCKS blocks x 4 ===" + export MKFS_OPTIONS="" _scratch_mkfs_geom $SUNIT_BYTES 4 $BLOCKSIZE >> $seq.full 2>&1 _scratch_mount diff --git a/common.rc b/common.rc index 760b883e..a5db913a 100644 --- a/common.rc +++ b/common.rc @@ -349,10 +349,10 @@ _scratch_mkfs_geom() case $FSTYP in xfs) - MKFS_OPTIONS+="-b size=$blocksize, -d su=$sunit_bytes,sw=$swidth_mult" + MKFS_OPTIONS+=" -b size=$blocksize, -d su=$sunit_bytes,sw=$swidth_mult" ;; ext4) - MKFS_OPTIONS+="-b $blocksize -E stride=$sunit_blocks,stripe_width=$swidth_blocks" + MKFS_OPTIONS+=" -b $blocksize -E stride=$sunit_blocks,stripe_width=$swidth_blocks" ;; *) _notrun "can't mkfs $FSTYP with geometry"