Author: lgiessmann Date: Wed Jul 21 10:39:18 2010 New Revision: 310 Log: new-datamodel: modified the test-script Modified: branches/new-datamodel/playground/isidorus_test.sh Modified: branches/new-datamodel/playground/isidorus_test.sh ============================================================================== --- branches/new-datamodel/playground/isidorus_test.sh (original) +++ branches/new-datamodel/playground/isidorus_test.sh Wed Jul 21 10:39:18 2010 @@ -6,6 +6,14 @@ resDir="results" logDir="logfiles" +T="true"; +Nil="false"; + +doReq1=$T; +doReq2=$Nil; +doReq3=$Nil; +doReq4=$Nil; + dir1="req1"; dir2="req2"; dir3="req3"; @@ -45,32 +53,68 @@ fi fi - path1=$log1$counter; - path2=$log2$counter; - path3=$log3$counter; - path4=$log4$counter; - result1=$res1$counter; - result2=$res2$counter; - result3=$res3$counter; - result4=$res4$counter; - wget -o $path1".log" -O $result1".res" $req1; - wget -o $path2".log" -O $result2".res" $req2; - wget -o $path3".log" -O $result3".res" $req3; - wget -o $path4".log" -O $result4".res" $req4; + + if [ $doReq1 == $T ]; then + path1=$log1$counter; + result1=$res1$counter; + wget -o $path1".log" -O $result1".res" $req1; + fi + + if [ $doReq2 == $T ]; then + path2=$log2$counter; + result2=$res2$counter; + wget -o $path2".log" -O $result2".res" $req2; + fi + + if [ $doReq3 == $T ]; then + path3=$log3$counter; + result3=$res3$counter; + wget -o $path3".log" -O $result3".res" $req3; + fi + + if [ $doReq4 == $T ]; then + path4=$log4$counter; + result4=$res4$counter; + wget -o $path4".log" -O $result4".res" $req4; + fi +} + + +function init { + mkdir $wDir; + cd $wDir; + + if [ $doReq1 == $T ]; then + mkdir -p $logDir"/"$dir1; + mkdir -p $resDir"/"$dir1; + fi + + if [ $doReq2 == $T ]; then + mkdir -p $logDir"/"$dir2; + mkdir -p $resDir"/"$dir2; + fi + + if [ $doReq3 == $T ]; then + mkdir -p $logDir"/"$dir3; + mkdir -p $resDir"/"$dir3; + fi + + if [ $doReq4 == $T ]; then + mkdir -p $logDir"/"$dir4; + mkdir -p $resDir"/"$dir4; + fi +} + + + +function main { + init; + + for i in `seq 1 200000`; do + flow $i; + done } -mkdir $wDir; -cd $wDir; -mkdir -p $logDir"/"$dir1; -mkdir -p $logDir"/"$dir2; -mkdir -p $logDir"/"$dir3; -mkdir -p $logDir"/"$dir4; -mkdir -p $resDir"/"$dir1; -mkdir -p $resDir"/"$dir2; -mkdir -p $resDir"/"$dir3; -mkdir -p $resDir"/"$dir4; -for i in `seq 1 50000`; do - flow $i; -done +main;