autopkgtests: consistently say "echo ok." at end of tests

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 3234054f6d4f75f155949082673f265287a77fc8..b6bf81088114a2c8f792995b23e7b7544e3af4d3 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -38,6 +38,8 @@ t-worktree () {
 }
 
 t-git () {
+       p=$1
+       v=$2
        mkdir -p $tmp/git
        (set -e; cd $tmp/git; tar xf $troot/git-srcs/${p}_$v.git.tar)
 }
@@ -48,8 +50,8 @@ t-git-none () {
 }
 
 t-has-ancestor () {
-       local ancestor=`git rev-parse $1`
        local now=`git rev-parse HEAD`
+       local ancestor=`git rev-parse $1^{}`
        local mbase=`git merge-base $ancestor $now`
        if [ x$mbase != x$ancestor ]; then
                echo "not ff $ancestor..$now, $mbase != $ancestor"
@@ -156,6 +158,7 @@ t-pushed-good () {
         t-refs-notexist \
                refs/dgit/unstable
        )
+       git verify-tag `t-v-tag`
 }
 
 t-ref-dsc-dgit () {