X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=28b08e617f51787711b9d19dcb92300a86328884;hb=47eda057287ddbf374a71a932f80e830df537d94;hp=248dca568f5214dabc24bb70eb0732af1b3ceec5;hpb=e9f102d97eb1c24b16b0c5641fcfd1fbc4c0be20;p=dgit.git diff --git a/tests/lib b/tests/lib index 248dca56..28b08e61 100644 --- a/tests/lib +++ b/tests/lib @@ -520,6 +520,14 @@ t-setup-done () { ' $vn "$(eval "printf '%s\n' \"\$$vn\"")" done + perl >&4 -"I$root" -MDebian::Dgit -we ' + foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { + print STDERR "saving-exporting $vn\n"; + printf "export %s=%s\n", $vn, shellquote $ENV{$vn} + or die $!; + } + ' + (set -e; cd $tmp; tar cf $import.tar $savedirs) printf >&4 "\n%s\n" "$importeval" @@ -736,6 +744,7 @@ t-splitbrain-pushed-good--unpack () { ln -s $tmp/incoming/*.orig*.tar* . ||: ln -s $incoming_dsc . ln -s ${incoming_dsc/.dsc/.debian.tar}* . + ln -s ${incoming_dsc/.dsc/.tar}* . ||: dpkg-source "$@" -x *.dsc cd */. git init @@ -845,6 +854,13 @@ t-dpm-pushed-good () { t-splitbrain-pushed-good-end-made-dep14 } +t-split-unchanged-pushed-good () { + local suite=${1:-sid} + t-splitbrain-pushed-good-start + t-splitbrain-pushed-good--unpack + t-splitbrain-pushed-good-end-made-dep14 +} + t-commit-build-push-expect-log () { local msg=$1 local mpat=$2