[FFmpeg-cvslog] tests/fate.sh: If cat *.rep fails try it with a for loop.

Michael Niedermayer git at videolan.org
Wed Jul 30 23:08:24 CEST 2014


ffmpeg | branch: release/2.3 | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 28 18:27:17 2014 +0200| [5411040802ac5009f42e7cff9f40eba0788ee54f] | committer: Michael Niedermayer

tests/fate.sh: If cat *.rep fails try it with a for loop.

Fixes fate on haiku, where cat dies due to too many arguments
xargs could be used too but we do not use xargs currently so it
would be an additional dependency.

Also the plain cat is left in place as it is faster than the loop

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit d554d004a67c30e3f38bec51b2c691cfe3af3bb8)

Conflicts:

	tests/fate.sh

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5411040802ac5009f42e7cff9f40eba0788ee54f
---

 tests/fate.sh |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/fate.sh b/tests/fate.sh
index 38458c7..ca3caa3 100755
--- a/tests/fate.sh
+++ b/tests/fate.sh
@@ -82,7 +82,8 @@ clean(){
 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
+    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
     test -n "$fate_recv" && $tar report *.log | gzip | $fate_recv
 }
 



More information about the ffmpeg-cvslog mailing list