diff options
-rwxr-xr-x | tests/setup/gdr-convert-gbp | 12 | ||||
-rwxr-xr-x | tests/setup/gdr-convert-gbp-noarchive | 9 |
2 files changed, 15 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-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 @@ -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 t-tstunt-parsechangelog p=example diff --git a/tests/setup/gdr-convert-gbp-noarchive b/tests/setup/gdr-convert-gbp-noarchive new file mode 100755 index 0000000..dfeea3b --- /dev/null +++ b/tests/setup/gdr-convert-gbp-noarchive @@ -0,0 +1,9 @@ +#!/bin/bash +set -e +. tests/lib +. $troot/lib-gdr + +t-dependencies GDR + +export ifarchive=: +t-chain-test gdr-convert-gbp |