test script improvements

tests/io-test

@@ -31,7 +31,7 @@ do_one() {
   n=`expr $n + 1`
 }
 
-j=3; test z$1 != z && j=$1
+test z$1 != z && j=$1 || j=1
 
 for c in `seq 1 $j`; do
   for n in `seq 0 3`; do

tests/scripts

@@ -6,8 +6,9 @@ set -e
 
 ../../tests/bandwidth-test
 ../../tests/eg-test
-../../tests/io-test
+../../tests/io-test 3
 ../../tests/large-ratio-test
 ../../tests/phase-test
 ../../tests/q-test
-../../tests/time-test
+../../tests/time-test 1
+../../tests/time-test 2

tests/time-test

@@ -8,27 +8,28 @@ set -e
 
 tool=./3-options-input-fn
 ext=f32; e=0
-c=2
-q1=0; q2=7
+test z$1 != z && c=$1 || c=2
+qs="`seq 0 7`"
+qv="4 20"
 rates="48000 77773 96000"
+time=`which time`
+BASE=`basename $0`
+TIME=/tmp/$BASE-time-$$
+ERR=/tmp/$BASE-err-$$
+uname -m |grep -q ^arm && len=60 || len=600
 
 for rate0 in $rates; do
-	rate1=$rate0
-	rate2=44100
+	rate1=44100
+	rate2=$rate0
 	for n in 1 2; do
-		rate1n=`expr $rate1 / 2`
-		sox -r $rate1 -n -c $c 0.$ext synth 5: sin 0:$rate1n gain -1
-
-		for q in `seq $q1 $q2`; do
-			echo $rate1 '-->' $rate2 c=$c q=$q
-			time $tool $rate1 $rate2 $c $e $e $q < 0.$ext > /dev/null;
+		sox -R -r $rate1 -n -c $c 0.$ext synth $len noise; sync
+		for q in $qs "$qv"; do
+			$time -f %e -o $TIME $tool $rate1 $rate2 $c $e $e $q < 0.$ext > /dev/null 2> $ERR
+			[ "$q" == "4 20" ] && q=v
+			echo $rate1 '-->' $rate2 c=$c q=$q t=`cat $TIME` `cat $ERR | sed 's/.*(/(/'`
 		done
-
-		echo $rate1 '-->' $rate2 c=$c q=v
-		time $tool $rate1 $rate2 $c $e $e 4 20 < 0.$ext > /dev/null
-
-		rate1=44100
-		rate2=$rate0
+		rate1=$rate0
+		rate2=44100
 	done
 done