diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-03-04 16:19:57 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-03-04 16:19:57 +0000 |
| commit | 89790ba2bfc9d0dc5ad407c5724b6ee616ecde58 (patch) | |
| tree | ab51aae3b177a3acd0a45d4d0366039776deae09 | |
| parent | 18d8398caf91ac585ae162a26ebddc0da756408f (diff) | |
| parent | cd846b47977485bd4063e77a3324e6b7840567a2 (diff) | |
| download | ffmpeg-89790ba2bfc9d0dc5ad407c5724b6ee616ecde58.tar.gz | |
Merge commit 'cd846b47977485bd4063e77a3324e6b7840567a2'
* commit 'cd846b47977485bd4063e77a3324e6b7840567a2':
fate: Ignore errors from concatenating report files
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rwxr-xr-x | tests/fate.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate.sh b/tests/fate.sh index 4b9180f0e0..885ea17a1b 100755 --- a/tests/fate.sh +++ b/tests/fate.sh @@ -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 } |