X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=tests%2Ffate.sh;h=86e4178c50b7b3a8de23a5fc362f15feb350886a;hb=f1c6a740fcb9ea0a977855bb708c0541149fa9cf;hp=5870f52604eb77220357859d8f018f0096b31893;hpb=673fe599b31bf2e9d5920ce5ef1a45c5e126d676;p=ffmpeg

diff --git a/tests/fate.sh b/tests/fate.sh
index 5870f52604e..86e4178c50b 100755
--- a/tests/fate.sh
+++ b/tests/fate.sh
@@ -9,8 +9,9 @@ die(){
 
 test -r "$config"  || die "usage: fate.sh <config>"
 
-workdir=$(dirname $config)
+workdir=$(cd $(dirname $config) && pwd)
 make=make
+tar='tar c'
 
 . "$config"
 
@@ -28,15 +29,13 @@ checkout(){
     case "$repo" in
         file:*|/*) src="${repo#file:}"      ;;
         git:*)     git clone "$repo" "$src" ;;
-        svn:*)     svn co    "$repo" "$src" ;;
     esac
 }
 
 update()(
     cd ${src} || return
     case "$repo" in
-        git:*) git pull ;;
-        svn:*) svn up   ;;
+        git:*) git pull --quiet ;;
     esac
 )
 
@@ -45,10 +44,12 @@ configure()(
     ${src}/configure                                                    \
         --prefix="${inst}"                                              \
         --samples="${samples}"                                          \
+        --enable-gpl                                                    \
         ${arch:+--arch=$arch}                                           \
         ${cpu:+--cpu="$cpu"}                                            \
         ${cross_prefix:+--cross-prefix="$cross_prefix"}                 \
         ${cc:+--cc="$cc"}                                               \
+        ${ld:+--ld="$ld"}                                               \
         ${target_os:+--target-os="$target_os"}                          \
         ${sysroot:+--sysroot="$sysroot"}                                \
         ${target_exec:+--target-exec="$target_exec"}                    \
@@ -70,18 +71,19 @@ 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 cz report *.log | $fate_recv
+    test -n "$fate_recv" && $tar report *.log | gzip | $fate_recv
 }
 
 fail(){
     report "$@"
+    clean
     exit
 }
 
@@ -90,19 +92,18 @@ lock ${workdir}     || die "${workdir} locked"
 cd ${workdir}       || die "cd ${workdir} failed"
 
 src=${workdir}/src
-build=${workdir}/build
-inst=${workdir}/install
-report=tests/data/fate/report
+: ${build:=${workdir}/build}
+: ${inst:=${workdir}/install}
 
 test -d "$src" && update || checkout || die "Error fetching source"
 
 cd ${workdir}
 
 version=$(${src}/version.sh ${src})
-test "$version" = "$(cat version 2>/dev/null)" && exit 0
-echo ${version} >version
+test "$version" = "$(cat version-$slot 2>/dev/null)" && exit 0
+echo ${version} >version-$slot
 
-rm -rf "${build}"
+rm -rf "${build}" *.log
 mkdir -p ${build}
 
 configure >configure.log 2>&1 || fail $? "error configuring"