path: root/tests/setup/gdr-convert-gbp
diff options
authorIan Jackson <>2018-06-17 17:18:06 +0100
committerIan Jackson <>2018-06-17 22:21:08 +0100
commit42a38acde0b4085c545342d1ec624937ce6be20e (patch)
tree2987ea2cd5d84d291b0d6ef130e0528870fab812 /tests/setup/gdr-convert-gbp
parent146d4d56e98cec6fc4b3f8f47df72c8b732aa6f3 (diff)
test suite: gdr-convert-gbp-noarchive: new setup kind
Introduce $ifnoarchive in gdr-convert-gbp, which allows us to run it without any of the operations which touch the simulated archive. This is faster. Also in the future after we split the packages this will make it possible to run this new setup without having dgit or the archive management tools installed. Signed-off-by: Ian Jackson <>
Diffstat (limited to 'tests/setup/gdr-convert-gbp')
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp
index 427f230..0b525c8 100755
--- a/tests/setup/gdr-convert-gbp
+++ b/tests/setup/gdr-convert-gbp
@@ -63,9 +63,9 @@ not-gdr-processable
t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)'
t-dch-commit -r sid
-t-archive-none $p
-t-dgit -wgf --gbp push-source --new
+$ifarchive t-archive-none $p
+$ifarchive t-git-none
+$ifarchive t-dgit -wgf --gbp push-source --new
git push --set-upstream origin master
@@ -83,14 +83,14 @@ v=2.0-2
t-dch-commit -v $v -m 'switch to git-debrebase, no other changes'
t-dch-commit -r sid
-t-dgit -wgf push-source --new --overwrite
+$ifarchive t-dgit -wgf push-source --new --overwrite
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