Re: [PATCH V2] xfstests: redirect output in btrfs/003

[Eric Sandeen <sandeen@redhat.com>]

On 8/16/13 10:18 AM, Stefan Behrens wrote:
> This test failed for me with output from 'btrfs balance':
>      QA output created by 003
>     +Done, had to relocate 4 out of 4 chunks
>     +Done, had to relocate 5 out of 5 chunks
>      Silence is golden
> 
> Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de>
> ---
> V1 -> V2:
> Redirect errors to $seqres.full as proposed by Eric.

Thanks!

Reviewed-by: Eric Sandeen <sandeen@redhat.com>


> 
>  tests/btrfs/003 | 28 +++++++++++++++-------------
>  1 file changed, 15 insertions(+), 13 deletions(-)
> 
> diff --git a/tests/btrfs/003 b/tests/btrfs/003
> index 3790935..5c88651 100755
> --- a/tests/btrfs/003
> +++ b/tests/btrfs/003
> @@ -52,11 +52,13 @@ _require_scratch
>  _require_scratch_dev_pool
>  _require_deletable_scratch_dev_pool
>  
> +rm -f $seqres.full
> +
>  # Test cases related to raid in btrfs
>  _test_raid0()
>  {
>  	export MKFS_OPTIONS="-m raid0 -d raid0"
> -	_scratch_mkfs $SCRATCH_DEV_POOL > /dev/null 2>&1 || _fail "mkfs failed"
> +	_scratch_mkfs $SCRATCH_DEV_POOL >> $seqres.full 2>&1 || _fail "mkfs failed"
>  	_scratch_mount
>  	dirp=`mktemp -duq $SCRATCH_MNT/dir.XXXXXX`
>  	_populate_fs -n 1 -f 20 -d 10 -r $dirp -s 10
> @@ -66,7 +68,7 @@ _test_raid0()
>  _test_raid1()
>  {
>  	export MKFS_OPTIONS="-m raid1 -d raid1"
> -	_scratch_mkfs $SCRATCH_DEV_POOL > /dev/null 2>&1 || _fail "mkfs failed"
> +	_scratch_mkfs $SCRATCH_DEV_POOL >> $seqres.full 2>&1 || _fail "mkfs failed"
>  	_scratch_mount
>  	dirp=`mktemp -duq $SCRATCH_MNT/dir.XXXXXX`
>  	_populate_fs -n 1 -f 20 -d 10 -r $dirp -s 10
> @@ -76,7 +78,7 @@ _test_raid1()
>  _test_raid10()
>  {
>  	export MKFS_OPTIONS="-m raid10 -d raid10"
> -	_scratch_mkfs $SCRATCH_DEV_POOL > /dev/null 2>&1 || _fail "mkfs failed"
> +	_scratch_mkfs $SCRATCH_DEV_POOL >> $seqres.full 2>&1 || _fail "mkfs failed"
>  	_scratch_mount
>  	dirp=`mktemp -duq $SCRATCH_MNT/dir.XXXXXX`
>  	_populate_fs -n 1 -f 20 -d 10 -r $dirp -s 10
> @@ -86,7 +88,7 @@ _test_raid10()
>  _test_single()
>  {
>  	export MKFS_OPTIONS="-m single -d single"
> -	_scratch_mkfs $SCRATCH_DEV_POOL > /dev/null 2>&1 || _fail "mkfs failed"
> +	_scratch_mkfs $SCRATCH_DEV_POOL >> $seqres.full 2>&1 || _fail "mkfs failed"
>  	_scratch_mount
>  	dirp=`mktemp -duq $SCRATCH_MNT/dir.XXXXXX`
>  	_populate_fs -n 1 -f 20 -d 10 -r $dirp -s 10
> @@ -102,14 +104,14 @@ _test_add()
>  	n=$(($n-1))
>  
>  	export MKFS_OPTIONS=""
> -	_scratch_mkfs > /dev/null 2>&1 || _fail "mkfs failed"
> +	_scratch_mkfs >> $seqres.full 2>&1 || _fail "mkfs failed"
>  	_scratch_mount
>  	dirp=`mktemp -duq $SCRATCH_MNT/dir.XXXXXX`
>  	_populate_fs -n 1 -f 20 -d 10 -r $dirp -s 10
>  	for i in `seq 1 $n`; do
> -		$BTRFS_UTIL_PROG device add ${devs[$i]} $SCRATCH_MNT > /dev/null 2>&1 || _fail "device add failed"
> +		$BTRFS_UTIL_PROG device add ${devs[$i]} $SCRATCH_MNT >> $seqres.full 2>&1 || _fail "device add failed"
>  	done
> -	$BTRFS_UTIL_PROG filesystem balance $SCRATCH_MNT || _fail "balance failed"
> +	$BTRFS_UTIL_PROG filesystem balance $SCRATCH_MNT >> $seqres.full 2>&1 || _fail "balance failed"
>  	umount $SCRATCH_MNT
>  }
>  
> @@ -127,7 +129,7 @@ _test_replace()
>  	ds=${devs[@]:0:$n}
>  
>  	export MKFS_OPTIONS="-m raid1 -d raid1"
> -	_scratch_mkfs "$ds" > /dev/null 2>&1 || _fail "tr: mkfs failed"
> +	_scratch_mkfs "$ds" >> $seqres.full 2>&1 || _fail "tr: mkfs failed"
>  	_scratch_mount
>  	dirp=`mktemp -duq $SCRATCH_MNT/dir.XXXXXX`
>  	_populate_fs -n 1 -f 20 -d 10 -r $dirp -s 10
> @@ -143,16 +145,16 @@ _test_replace()
>  	_devmgt_remove ${DEVHTL}
>  	dev_removed=1
>  
> -	$BTRFS_UTIL_PROG fi show $SCRATCH_DEV | grep "Some devices missing" > /dev/null || _fail \
> +	$BTRFS_UTIL_PROG fi show $SCRATCH_DEV | grep "Some devices missing" >> $seqres.full || _fail \
>  							"btrfs did not report device missing"
>  
>  	# add a new disk to btrfs
>  	ds=${devs[@]:$(($n)):1}
> -	$BTRFS_UTIL_PROG device add ${ds} $SCRATCH_MNT > /dev/null 2>&1 || _fail "dev add failed"
> +	$BTRFS_UTIL_PROG device add ${ds} $SCRATCH_MNT >> $seqres.full 2>&1 || _fail "dev add failed"
>  	# in some system balance fails if there is no delay (a bug)
>  	# putting sleep 10 to work around as of now
>  	# sleep 10
> -	$BTRFS_UTIL_PROG filesystem balance $SCRATCH_MNT || _fail "dev balance failed"
> +	$BTRFS_UTIL_PROG filesystem balance $SCRATCH_MNT >> $seqres.full 2>&1 || _fail "dev balance failed"
>  
>  	# cleaup. add the removed disk
>  	umount $SCRATCH_MNT
> @@ -162,7 +164,7 @@ _test_replace()
>  
>  _test_remove()
>  {
> -	_scratch_mkfs "$SCRATCH_DEV_POOL" > /dev/null 2>&1 || _fail "mkfs failed"
> +	_scratch_mkfs "$SCRATCH_DEV_POOL" >> $seqres.full 2>&1 || _fail "mkfs failed"
>  	_scratch_mount
>  	dirp=`mktemp -duq $SCRATCH_MNT/dir.XXXXXX`
>  	_populate_fs -n 1 -f 20 -d 10 -r $dirp -s 10
> @@ -170,7 +172,7 @@ _test_remove()
>  	# pick last dev in the list
>  	dev_del=`echo ${SCRATCH_DEV_POOL} | awk '{print $NF}'`
>  	$BTRFS_UTIL_PROG device delete $dev_del $SCRATCH_MNT || _fail "btrfs device delete failed"
> -	$BTRFS_UTIL_PROG filesystem show $SCRATCH_DEV 2>&1 | grep $dev_del > /dev/null && _fail "btrfs still shows the deleted dev"
> +	$BTRFS_UTIL_PROG filesystem show $SCRATCH_DEV 2>&1 | grep $dev_del >> $seqres.full && _fail "btrfs still shows the deleted dev"
>  	umount $SCRATCH_MNT
>  }
>  
>