X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Fsetup%2Fgdr-convert-gbp;h=d64b867c66653482c1ae030df1a3ecbe0f0e1019;hb=a47f1af332372a372bf5758d1e3d9eeffe14acbd;hp=427f2301205e79a13f8b88c35de5d36a8b8790a4;hpb=f7e37ea9f83b46c5efa4152b36c6cc0f4b91fadd;p=dgit.git

diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp
index 427f2301..d64b867c 100755
--- a/tests/setup/gdr-convert-gbp
+++ b/tests/setup/gdr-convert-gbp
@@ -1,8 +1,11 @@
 #!/bin/bash
 set -e
+autoimport=
 . tests/lib
 . $troot/lib-gdr
 
+$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
@@ -81,16 +84,16 @@ t-git-debrebase -fupstream-has-debian convert-from-gbp
 
 v=2.0-2
 t-dch-commit -v $v -m 'switch to git-debrebase, no other changes'
-t-dch-commit -r sid
+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