Commit 7f53f113 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '42eb9154'

* commit '42eb9154':
  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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 3d93ba56 42eb9154
...@@ -19,6 +19,8 @@ test -n "$slot" || die "slot not specified" ...@@ -19,6 +19,8 @@ test -n "$slot" || die "slot not specified"
test -n "$repo" || die "repo not specified" test -n "$repo" || die "repo not specified"
test -d "$samples" || die "samples location not specified" test -d "$samples" || die "samples location not specified"
: ${branch:=master}
lock(){ lock(){
lock=$1/fate.lock lock=$1/fate.lock
(set -C; exec >$lock) 2>/dev/null || return (set -C; exec >$lock) 2>/dev/null || return
...@@ -28,14 +30,14 @@ lock(){ ...@@ -28,14 +30,14 @@ lock(){
checkout(){ checkout(){
case "$repo" in case "$repo" in
file:*|/*) src="${repo#file:}" ;; file:*|/*) src="${repo#file:}" ;;
git:*) git clone --quiet "$repo" "$src" ;; git:*) git clone --quiet --branch "$branch" "$repo" "$src" ;;
esac esac
} }
update()( update()(
cd ${src} || return cd ${src} || return
case "$repo" in case "$repo" in
git:*) git fetch --force && git reset --hard FETCH_HEAD ;; git:*) git fetch --force && git reset --hard "origin/$branch" ;;
esac esac
) )
...@@ -82,6 +84,7 @@ clean(){ ...@@ -82,6 +84,7 @@ clean(){
report(){ report(){
date=$(date -u +%Y%m%d%H%M%S) date=$(date -u +%Y%m%d%H%M%S)
echo "fate:0:${date}:${slot}:${version}:$1:$2:${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 cat ${build}/config.fate ${build}/tests/data/fate/*.rep >>report
test -n "$fate_recv" && $tar report *.log | gzip | $fate_recv test -n "$fate_recv" && $tar report *.log | gzip | $fate_recv
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment