aboutsummaryrefslogtreecommitdiffstats
path: root/tests/fate.sh
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-27 21:47:42 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-27 22:03:13 +0200
commit7f53f1136346c83093219b260d5c95461f64193e (patch)
tree45f8e609a60d6e39fdff94442ebfdf9af2d06ce0 /tests/fate.sh
parent3d93ba562243b6d8afac3c875c05304d41da94bf (diff)
parent42eb9154a83e9a7aedb1168b2f1112af765cf2b5 (diff)
downloadffmpeg-7f53f1136346c83093219b260d5c95461f64193e.tar.gz
Merge commit '42eb9154a83e9a7aedb1168b2f1112af765cf2b5'
* 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>
Diffstat (limited to 'tests/fate.sh')
-rwxr-xr-xtests/fate.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/fate.sh b/tests/fate.sh
index 38458c748c..a1a7e350d0 100755
--- a/tests/fate.sh
+++ b/tests/fate.sh
@@ -19,6 +19,8 @@ test -n "$slot" || die "slot not specified"
test -n "$repo" || die "repo not specified"
test -d "$samples" || die "samples location not specified"
+: ${branch:=master}
+
lock(){
lock=$1/fate.lock
(set -C; exec >$lock) 2>/dev/null || return
@@ -28,14 +30,14 @@ lock(){
checkout(){
case "$repo" in
file:*|/*) src="${repo#file:}" ;;
- git:*) git clone --quiet "$repo" "$src" ;;
+ git:*) git clone --quiet --branch "$branch" "$repo" "$src" ;;
esac
}
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" ;;
esac
)
@@ -82,6 +84,7 @@ clean(){
report(){
date=$(date -u +%Y%m%d%H%M%S)
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
}