git-debrebase: test suite: introduce t-dch-commit

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/tests/lib b/tests/lib
index e226637fce41ea84a89c8dde68432c0cd8c81e5a..dd8c4d0152ac08cc51ab260e5187bce072ab7c0f 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -1004,6 +1004,11 @@ t-commit () {
        revision=$(( ${revision-0} + 1 ))
 }
 
+t-dch-commit () {
+       dch "$@"
+       git commit -m "dch $*" debian/changelog
+}
+
 t-git-config () {
        git config --global "$@"
 }

diff --git a/tests/setup/gbp2gdr b/tests/setup/gbp2gdr
index 7608a12987c190cc37ba50a4cad0288043d51bb8..2dbb51548af5f928efd2d9e08ff79695494ae7e4 100755 (executable)
--- a/tests/setup/gbp2gdr
+++ b/tests/setup/gbp2gdr
@@ -63,9 +63,8 @@ gbp import-orig --upstream-version=2.0 ../$ust
 
 not-gdr-processable
 
-dch -v 2.0-1 -m 'new upstream (did gbp import-orig)'
-dch -r sid
-git commit -m changelog debian/changelog
+t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)'
+t-dch-commit -r sid
 
 t-archive-none $p
 t-git-none

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index 30786fee76f8d2245a630538d0b0faeceb5be8fd..3efd063d408fac83f685809aa3209156e1ca9c18 100755 (executable)
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -9,8 +9,7 @@ t-setup-import gbp2gdr
 cd $p
 
 v=2.0-3
-dch -v $v -m testing
-git commit -m changelog debian/changelog
+t-dch-commit -v $v -m testing
 
 t-git-debrebase analyse |tee ../anal.1
 cat ../anal.1
@@ -28,8 +27,7 @@ for f in debian/zorkmid src.c; do
 done
 git commit -m 'MIXED add boths'
 
-dch -r sid
-git commit -m changelog debian/changelog
+t-dch-commit -r sid
 
 git tag t.before