Add missing #includes for standalone spherical-information-related headers

[ffmpeg] / tests / fate.sh

diff --git a/tests/fate.sh b/tests/fate.sh
index af2e14f8bfd760b9f33e8d44845c243b9c10a403..f7ca89135cc202a9543c550c1f37373a26ab2bd9 100755 (executable)
--- 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"
 
@@ -18,6 +19,8 @@ test -n "$slot"    || die "slot not specified"
 test -n "$repo"    || die "repo not specified"
 test -d "$samples" || die "samples location not specified"
 
+: ${branch:=master}
+
 lock(){
     lock=$1/fate.lock
     (set -C; exec >$lock) 2>/dev/null || return
@@ -27,16 +30,14 @@ lock(){
 checkout(){
     case "$repo" in
         file:*|/*) src="${repo#file:}"      ;;
-        git:*)     git clone "$repo" "$src" ;;
-        svn:*)     svn co    "$repo" "$src" ;;
+        git:*)     git clone --quiet --branch "$branch" "$repo" "$src" ;;
     esac
 }
 
 update()(
     cd ${src} || return
     case "$repo" in
-        git:*) git pull ;;
-        svn:*) svn up   ;;
+        git:*) git fetch --quiet --force; git reset --quiet --hard "origin/$branch" ;;
     esac
 )
 
@@ -45,14 +46,19 @@ configure()(
     ${src}/configure                                                    \
         --prefix="${inst}"                                              \
         --samples="${samples}"                                          \
+        --enable-gpl                                                    \
         ${arch:+--arch=$arch}                                           \
         ${cpu:+--cpu="$cpu"}                                            \
+        ${toolchain:+--toolchain="$toolchain"}                          \
         ${cross_prefix:+--cross-prefix="$cross_prefix"}                 \
+        ${as:+--as="$as"}                                               \
         ${cc:+--cc="$cc"}                                               \
+        ${ld:+--ld="$ld"}                                               \
         ${target_os:+--target-os="$target_os"}                          \
         ${sysroot:+--sysroot="$sysroot"}                                \
         ${target_exec:+--target-exec="$target_exec"}                    \
         ${target_path:+--target-path="$target_path"}                    \
+        ${target_samples:+--target-samples="$target_samples"}           \
         ${extra_cflags:+--extra-cflags="$extra_cflags"}                 \
         ${extra_ldflags:+--extra-ldflags="$extra_ldflags"}              \
         ${extra_libs:+--extra-libs="$extra_libs"}                       \
@@ -65,19 +71,25 @@ compile()(
 )
 
 fate()(
+    test "$build_only" = "yes" && return
     cd ${build} || return
-    ${make} ${makeopts} -k fate
+    ${make} ${makeopts_fate-${makeopts}} -k fate
 )
 
+clean(){
+    rm -rf ${build} ${inst}
+}
+
 report(){
     date=$(date -u +%Y%m%d%H%M%S)
-    echo "fate:0:${date}:${slot}:${version}:$1:$2" >report
-    cat ${build}/config.fate ${build}/tests/data/fate/*.rep >>report
-    test -n "$fate_recv" && tar cz report *.log | $fate_recv
+    echo "fate:1:${date}:${slot}:${version}:$1:$2:${branch}:${comment}" >report
+    cat ${build}/config.fate ${build}/tests/data/fate/*.rep >>report 2>/dev/null
+    test -n "$fate_recv" && $tar report *.log | gzip | $fate_recv
 }
 
 fail(){
     report "$@"
+    clean
     exit
 }
 
@@ -86,22 +98,22 @@ 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"
 compile   >compile.log   2>&1 || fail $? "error compiling"
 fate      >test.log      2>&1 || fail $? "error testing"
 report 0 success
+clean