From 3f159147261bc0becddd5359e87efc753655dad8 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Mon, 14 Feb 2005 13:52:46 +0000 Subject: [PATCH] Updates to aio-stress test to make multi-threaded tests really that way. Merge of master-melb:xfs-cmds:21490a by kenmcd. --- 113 | 29 +++++++++++++++++------------ 113.out | 2 +- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/113 b/113 index 107519d6..e72863f2 100755 --- a/113 +++ b/113 @@ -65,15 +65,22 @@ _do_test() _n="$1" _param="$2" _count="$3" - - out=$testdir/aiostress.$$.$_n - rm -f $out + _nproc="$4" + + _files="$testdir/aiostress.$$.$_n" + __proc=$_nproc + [ $__proc -gt 1 ] && _param="-t $__proc $_param" + while [ $__proc -gt 1 ]; do + _files="$_files $testdir/aiostress.$$.$_n.$__proc" + __proc=`expr $__proc - 1` + done + rm -f $_files echo "" echo "-----------------------------------------------" echo "aio-stress.$_n : $_param" echo "-----------------------------------------------" - if ! $here/ltp/aio-stress $_param $AIOSTRESS_AVOID -I $_count $out >>$tmp.out 2>&1 + if ! $here/ltp/aio-stress $_param $AIOSTRESS_AVOID -I $_count $_files >>$tmp.out 2>&1 then echo " aio-stress (count=$_count) returned $?" cat $tmp.out @@ -85,8 +92,9 @@ _do_test() # real QA test starts here -_supported_fs xfs udf -_supported_os IRIX Linux +_supported_os Linux + +[ -x $here/ltp/aio-stress ] || _notrun "aio-stress not built for this platform" _setup_testdir @@ -97,16 +105,13 @@ procs=20 _check_test_fs -# LTP - -I500 -o3 -S -r128 -t4 - # the default -_do_test 1 "" $count +_do_test 1 "" $count 1 # and the default with multiprocess -_do_test 2 "-t $procs" $count +_do_test 2 "" $count $procs # as above, but now using direct IO -_do_test 3 "-t $procs -O" $count +_do_test 3 "-O" $count $procs exit diff --git a/113.out b/113.out index c87de23e..8f3aeb74 100644 --- a/113.out +++ b/113.out @@ -6,7 +6,7 @@ aio-stress.1 : ----------------------------------------------- ----------------------------------------------- -aio-stress.2 : -t 20 +aio-stress.2 : -t 20 ----------------------------------------------- ----------------------------------------------- -- 2.47.3