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

[ffmpeg] / tests / fate.sh

diff --git a/tests/fate.sh b/tests/fate.sh
index 9fd117c3bce0500b30d263f0dd778317dc5ceeb8..f7ca89135cc202a9543c550c1f37373a26ab2bd9 100755 (executable)
--- a/tests/fate.sh
+++ b/tests/fate.sh
@@ -19,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
@@ -28,14 +30,14 @@ lock(){
 checkout(){
     case "$repo" in
         file:*|/*) src="${repo#file:}"      ;;
-        git:*)     git clone "$repo" "$src" ;;
+        git:*)     git clone --quiet --branch "$branch" "$repo" "$src" ;;
     esac
 }
 
 update()(
     cd ${src} || return
     case "$repo" in
-        git:*) git pull ;;
+        git:*) git fetch --quiet --force; git reset --quiet --hard "origin/$branch" ;;
     esac
 )
 
@@ -47,12 +49,16 @@ configure()(
         --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,18 +71,19 @@ compile()(
 )
 
 fate()(
+    test "$build_only" = "yes" && return
     cd ${build} || return
-    ${make} ${makeopts} -k fate
+    ${make} ${makeopts_fate-${makeopts}} -k 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:${comment}" >report
-    cat ${build}/config.fate ${build}/tests/data/fate/*.rep >>report
+    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
 }