Test suite: t-commit: honour $majorv for major version

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index c81a7922ef89bbd9d7f55040f9dfa6e02f9d5655..9b8894ef74b60569b77c46da8753c5bab0474bd2 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -335,7 +335,7 @@ t-dgit () {
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
        $dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
                -dtest-dummy $DGIT_TEST_OPTS $DGIT_TEST_DEBUG \
-               -k39B13D8A "$@"
+               -k39B13D8A $t_dgit_xopts "$@"
        : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
 '
 }
@@ -654,7 +654,7 @@ t-gbp-example-prep () {
 
 t-commit () {
        local msg=$1
-       v=${2:-1.$revision}
+       v=${2:-${majorv:-1}.$revision}
        dch -v$v --distribution ${3:-unstable} "$1"
        git add debian/changelog
        debcommit