test suite: Factor out t-dch-commit-r

[dgit.git] / tests / setup / gdr-convert-gbp

diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp
index 8a21037166e06a870778f113f284d7c1891ba150..d64b867c66653482c1ae030df1a3ecbe0f0e1019 100755 (executable)
--- a/tests/setup/gdr-convert-gbp
+++ b/tests/setup/gdr-convert-gbp
@@ -1,9 +1,12 @@
 #!/bin/bash
 set -e
+autoimport=
 . tests/lib
 . $troot/lib-gdr
 
-t-dependencies git-buildpackage libfile-fnmatch-perl
+$ifarchive t-setup-import gnupg
+
+t-dependencies GDR
 
 t-tstunt-parsechangelog
 
@@ -61,11 +64,11 @@ gbp import-orig --upstream-version=2.0 ../$ust
 not-gdr-processable
 
 t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)'
-t-dch-commit -r sid
+t-dch-commit-r
 
-t-archive-none $p
-t-git-none
-t-dgit -wgf --gbp push-source --new
+$ifarchive t-archive-none $p
+$ifarchive t-git-none
+$ifarchive t-dgit -wgf --gbp push-source --new
 
 t-salsa-add-remote
 git push --set-upstream origin master
@@ -80,18 +83,17 @@ git push --set-upstream origin master
 t-git-debrebase -fupstream-has-debian convert-from-gbp
 
 v=2.0-2
-dch -v $v -m 'switch to git-debrebase, no other changes'
-dch -r sid
-git commit -m changelog debian/changelog
+t-dch-commit -v $v -m 'switch to git-debrebase, no other changes'
+t-dch-commit-r
 
-t-dgit -wgf push-source --new --overwrite
+$ifarchive t-dgit -wgf push-source --new
 git push
 
 cd ..
 
-t-archive-process-incoming sid
+$ifarchive t-archive-process-incoming sid
 
-t-setup-done '' "$(echo $p*) git mirror salsa aq" '
+t-setup-done '' "$(echo $p*) salsa $($ifarchive echo git mirror aq)" '
        . $troot/lib-gdr
        t-tstunt-parsechangelog
        p=example