From 0720d263ea2bdd28cd3be1d1e802d49d7c680b8c Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Sat, 10 Mar 2012 18:50:45 -0500 Subject: FATE: use $fuzz directly in do_tiny_psnr() instead of passing it around --- tests/fate-run.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index a1503aecbd..419a3ebc8a 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -14,7 +14,7 @@ target_path=$4 command=$5 cmp=${6:-diff} ref=${7:-"${base}/ref/fate/${test}"} -fuzz=$8 +fuzz=${8:-1} threads=${9:-1} thread_type=${10:-frame+slice} cpuflags=${11:-all} @@ -30,7 +30,7 @@ do_tiny_psnr(){ val=$(expr "$psnr" : ".*$3: *\([0-9.]*\)") size1=$(expr "$psnr" : '.*bytes: *\([0-9]*\)') size2=$(expr "$psnr" : '.*bytes:[ 0-9]*/ *\([0-9]*\)') - res=$(echo "if ($val $4 $5) 1" | bc) + res=$(echo "if ($val $4 $fuzz) 1" | bc) if [ "$res" != 1 ] || [ $size1 != $size2 ]; then echo "$psnr" return 1 @@ -38,11 +38,11 @@ do_tiny_psnr(){ } oneoff(){ - do_tiny_psnr "$1" "$2" MAXDIFF '<=' ${fuzz:-1} + do_tiny_psnr "$1" "$2" MAXDIFF '<=' } stddev(){ - do_tiny_psnr "$1" "$2" stddev '<=' ${fuzz:-1} + do_tiny_psnr "$1" "$2" stddev '<=' } run(){ @@ -122,8 +122,8 @@ fi if test -e "$ref"; then case $cmp in diff) diff -u -w "$ref" "$outfile" >$cmpfile ;; - oneoff) oneoff "$ref" "$outfile" "$fuzz" >$cmpfile ;; - stddev) stddev "$ref" "$outfile" "$fuzz" >$cmpfile ;; + oneoff) oneoff "$ref" "$outfile" >$cmpfile ;; + stddev) stddev "$ref" "$outfile" >$cmpfile ;; null) cat "$outfile" >$cmpfile ;; esac cmperr=$? -- cgit v1.2.3