ac3enc: do not right-shift fixed-point coefficients in the final MDCT stage.

[ffmpeg] / tests / fate-run.sh

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 2db31acb73ce3b658fb6e6b58397cc4e463a031a..c4a9a13e117cac2378ce0e859a2963fbb5fc17b0 100755 (executable)
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -1,8 +1,12 @@
 #! /bin/sh
 
+export LC_ALL=C
+
 base=$(dirname $0)
 . "${base}/md5.sh"
 
+base64=tests/base64
+
 test="${1#fate-}"
 samples=$2
 target_exec=$3
@@ -14,13 +18,16 @@ fuzz=$8
 
 outdir="tests/data/fate"
 outfile="${outdir}/${test}"
+errfile="${outdir}/${test}.err"
+cmpfile="${outdir}/${test}.diff"
+repfile="${outdir}/${test}.rep"
 
 do_tiny_psnr(){
     psnr=$(tests/tiny_psnr "$1" "$2" 2 0 0)
     val=$(expr "$psnr" : ".*$3: *\([0-9.]*\)")
     size1=$(expr "$psnr" : '.*bytes: *\([0-9]*\)')
     size2=$(expr "$psnr" : '.*bytes:[ 0-9]*/ *\([0-9]*\)')
-    res=$(echo "$val $4 $5" | bc)
+    res=$(echo "if ($val $4 $5) 1" | bc)
     if [ "$res" != 1 ] || [ $size1 != $size2 ]; then
         echo "$psnr"
         return 1
@@ -35,8 +42,13 @@ stddev(){
     do_tiny_psnr "$1" "$2" stddev  '<=' ${fuzz:-1}
 }
 
+run(){
+    test "${V:-0}" -gt 0 && echo "$target_exec" $target_path/"$@" >&3
+    $target_exec $target_path/"$@"
+}
+
 ffmpeg(){
-    $target_exec $target_path/ffmpeg "$@"
+    run ffmpeg -v 0 "$@"
 }
 
 framecrc(){
@@ -62,7 +74,9 @@ pcm(){
 regtest(){
     t="${test#$2-}"
     ref=${base}/ref/$2/$t
+    cleanfiles="$cleanfiles $outfile $errfile"
     outfile=tests/data/regression/$2/$t
+    errfile=tests/data/$t.$2.err
     ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path"
 }
 
@@ -75,6 +89,7 @@ lavftest(){
 }
 
 lavfitest(){
+    cleanfiles="tests/data/lavfi/${test#lavfi-}.nut"
     regtest lavfi lavfi tests/vsynth1
 }
 
@@ -95,20 +110,30 @@ seektest(){
 
 mkdir -p "$outdir"
 
-$command > "$outfile" 2>/dev/null
+exec 3>&2
+$command > "$outfile" 2>$errfile
 err=$?
 
-if ! test -e "$ref"; then
+if [ $err -gt 128 ]; then
+    sig=$(kill -l $err 2>/dev/null)
+    test "${sig}" = "${sig%[!A-Za-z]*}" || unset sig
+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 ;;
+    esac
+    cmperr=$?
+    test $err = 0 && err=$cmperr
+    test $err = 0 || cat $cmpfile
+else
     echo "reference file '$ref' not found"
-    exit 1
+    err=1
 fi
 
-case $cmp in
-    diff)   diff -u -w "$ref" "$outfile"            ;;
-    oneoff) oneoff     "$ref" "$outfile" "$fuzz"    ;;
-    stddev) stddev     "$ref" "$outfile" "$fuzz"    ;;
-esac
+echo "${test}:${sig:-$err}:$($base64 <$cmpfile):$($base64 <$errfile)" >$repfile
 
-cmperr=$?
-test $err = 0 && err=$cmperr
-test $err = 0 && rm $outfile
+test $err = 0 && rm -f $outfile $errfile $cmpfile $cleanfiles
+exit $err