diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-28 18:27:17 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-30 22:39:08 +0200 |
commit | 5411040802ac5009f42e7cff9f40eba0788ee54f (patch) | |
tree | 3be4c35b032b6eb378665ea6adc48ca7ead4e9b7 | |
parent | ab1ea597bd69d0d13f655c8934e3fa9c772a0a8d (diff) | |
download | ffmpeg-5411040802ac5009f42e7cff9f40eba0788ee54f.tar.gz |
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@gmx.at>
(cherry picked from commit d554d004a67c30e3f38bec51b2c691cfe3af3bb8)
Conflicts:
tests/fate.sh
-rwxr-xr-x | tests/fate.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/fate.sh b/tests/fate.sh index 38458c748c..ca3caa3b1b 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 } |