Merge commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc'

[ffmpeg] / tests / fate.sh

diff --git a/tests/fate.sh b/tests/fate.sh
index a695f88220a4f3bf394d98bc79dc97222d0a7d94..885ea17a1b6a088cad1ccbbde2a43220def7f3f6 100755 (executable)
--- a/tests/fate.sh
+++ b/tests/fate.sh
@@ -37,7 +37,7 @@ checkout(){
 update()(
     cd ${src} || return
     case "$repo" in
-        git:*) git fetch --force && git reset --quiet --hard "origin/$branch" ;;
+        git:*) git fetch --quiet --force && git reset --quiet --hard "origin/$branch" ;;
     esac
 )
 
@@ -86,7 +86,7 @@ report(){
     date=$(date -u +%Y%m%d%H%M%S)
     echo "fate:1:${date}:${slot}:${version}:$1:$2:${branch}:${comment}" >report
     cat ${build}/config.fate >>report
-    cat ${build}/tests/data/fate/*.rep >>report || for i in ${build}/tests/data/fate/*.rep ; do cat "$i" >>report ; done
+    cat ${build}/tests/data/fate/*.rep >>report || for i in ${build}/tests/data/fate/*.rep ; do cat "$i" >>report 2>/dev/null; done
     test -n "$fate_recv" && $tar report *.log | gzip | $fate_recv
 }