generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fate: support testing of release branches

Browse Source 
Adding 'branch=release/2.3' to the fate config file will check the
release/2.3 branch instead of master. If no branch is specified it will
use 'master' so that existing config are still valid.

(cherry picked from commit 42eb9154a83e9a7aedb1168b2f1112af765cf2b5)

Conflicts:

	tests/fate.sh
This commit is contained in:
Janne Grunau 2014-07-26 23:29:46 +02:00 committed by Michael Niedermayer
parent 5411040802
commit 6a250c858e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/fate.sh
View File

@ -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(){
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(){
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 >>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 ; done
test -n "$fate_recv" && $tar report *.log | gzip | $fate_recv test -n "$fate_recv" && $tar report *.log | gzip | $fate_recv