Merge commit '42eb9154a83e9a7aedb1168b2f1112af765cf2b5'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Jul 2014 19:47:42 +0000 (21:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Jul 2014 20:03:13 +0000 (22:03 +0200)
* commit '42eb9154a83e9a7aedb1168b2f1112af765cf2b5':
  fate: support testing of release branches

Conflicts:
tests/fate.sh

The communication protocol is left at version 0 as our fate server
hasnt been updated to support this yet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
tests/fate.sh

diff --cc tests/fate.sh
@@@ -35,7 -37,7 +37,7 @@@ checkout()
  update()(
      cd ${src} || return
      case "$repo" in
-         git:*) git fetch --force && git reset --hard FETCH_HEAD ;;
 -        git:*) git fetch --force; git reset --hard "origin/$branch" ;;
++        git:*) git fetch --force && git reset --hard "origin/$branch" ;;
      esac
  )
  
@@@ -81,7 -81,7 +83,8 @@@ clean()
  
  report(){
      date=$(date -u +%Y%m%d%H%M%S)
 -    echo "fate:1:${date}:${slot}:${version}:$1:$2:${branch}:${comment}" >report
 +    echo "fate:0:${date}:${slot}:${version}:$1:$2:${comment}" >report
++#    echo "fate:1:${date}:${slot}:${version}:$1:$2:${branch}:${comment}" >report
      cat ${build}/config.fate ${build}/tests/data/fate/*.rep >>report
      test -n "$fate_recv" && $tar report *.log | gzip | $fate_recv
  }