Merge remote-tracking branch 'qatar/master'

[ffmpeg] / tests / fate.sh

diff --git a/tests/fate.sh b/tests/fate.sh
index 6f0e0fffcb4102fdefd324d64a660b3219fc7856..a7b15cd1b030da58c4d30aae17e06792a1b04011 100755 (executable)
--- a/tests/fate.sh
+++ b/tests/fate.sh
@@ -35,13 +35,13 @@ checkout(){
 update()(
     cd ${src} || return
     case "$repo" in
-        git:*) git pull ;;
+        git:*) git pull --quiet ;;
     esac
 )
 
 configure()(
     cd ${build} || return
-    ${src}/configure                                                    \
+    ${shell} ${src}/configure                                           \
         --prefix="${inst}"                                              \
         --samples="${samples}"                                          \
         --enable-gpl                                                    \
@@ -70,12 +70,12 @@ fate()(
 )
 
 clean(){
-    rm -r ${build} ${inst}
+    rm -rf ${build} ${inst}
 }
 
 report(){
     date=$(date -u +%Y%m%d%H%M%S)
-    echo "fate:0:${date}:${slot}:${version}:$1:$2" >report
+    echo "fate:0:${date}:${slot}:${version}:$1:$2:${comment}" >report
     cat ${build}/config.fate ${build}/tests/data/fate/*.rep >>report
     test -n "$fate_recv" && $tar report *.log | gzip | $fate_recv
 }
@@ -91,8 +91,8 @@ lock ${workdir}     || die "${workdir} locked"
 cd ${workdir}       || die "cd ${workdir} failed"
 
 src=${workdir}/src
-build=${workdir}/build
-inst=${workdir}/install
+: ${build:=${workdir}/build}
+: ${inst:=${workdir}/install}
 
 test -d "$src" && update || checkout || die "Error fetching source"