Merge remote-tracking branch 'qatar/master'

[ffmpeg] / tests / fate-run.sh

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 350ff573c77918bf59d8e3477002526af0b58352..f7a51ad2b8e13a59fafaedd781129f8b298da65c 100755 (executable)
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -17,7 +17,7 @@ ref=${7:-"${base}/ref/fate/${test}"}
 fuzz=$8
 threads=${9:-1}
 thread_type=${10:-frame+slice}
-tool=${11}
+cpuflags=${11:-all}
 
 outdir="tests/data/fate"
 outfile="${outdir}/${test}"
@@ -51,7 +51,7 @@ run(){
 }
 
 avconv(){
-    run $tool -nostats -threads $threads -thread_type $thread_type "$@"
+    run ffmpeg -nostats -threads $threads -thread_type $thread_type -cpuflags $cpuflags "$@"
 }
 
 framecrc(){
@@ -77,13 +77,17 @@ pcm(){
 regtest(){
     t="${test#$2-}"
     ref=${base}/ref/$2/$t
-    ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type" "$tool"
+    ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type" "$cpuflags" "$samples"
 }
 
 codectest(){
     regtest codec $1 tests/$1
 }
 
+lavffatetest(){
+    regtest lavf lavf-fate tests/vsynth1
+}
+
 lavftest(){
     regtest lavf lavf tests/vsynth1
 }
@@ -136,5 +140,9 @@ fi
 
 echo "${test}:${sig:-$err}:$($base64 <$cmpfile):$($base64 <$errfile)" >$repfile
 
-test $err = 0 && rm -f $outfile $errfile $cmpfile $cleanfiles
+if test $err = 0; then
+    rm -f $outfile $errfile $cmpfile $cleanfiles
+else
+    echo "Test $test failed. Look at $errfile for details."
+fi
 exit $err