Merge commit 'cd846b47977485bd4063e77a3324e6b7840567a2'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Fri, 4 Mar 2016 16:19:57 +0000 (16:19 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Fri, 4 Mar 2016 16:19:57 +0000 (16:19 +0000)
* commit 'cd846b47977485bd4063e77a3324e6b7840567a2':
  fate: Ignore errors from concatenating report files

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
tests/fate.sh

diff --cc tests/fate.sh
@@@ -85,8 -83,7 +85,8 @@@ clean()
  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 ${build}/tests/data/fate/*.rep >>report 2>/dev/null
 +    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
  }