X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=23daeace743e6e06e0fa36c5e81bdee43670eaa1;hp=1a5ec25a84123b78ebbcec66d7ac41764b094ae8;hb=476be97f847c7dd52a98647ed9f4240791ff380e;hpb=a539b3be49374fc958784cf77ac4be69c5fab546 diff --git a/tests/lib b/tests/lib index 1a5ec25a..23daeace 100644 --- a/tests/lib +++ b/tests/lib @@ -21,6 +21,8 @@ END trap 'test $? = 0 || t-report-failure' EXIT +t-filter-out-git-hyphen-dir + t-set-intree : ${DGIT_TEST_DEBUG=-D} @@ -40,6 +42,8 @@ if [ x"$tmp" = x ]; then tmp=tests/tmp/$testname rm -rf $tmp mkdir $tmp +elif [ "x$DGIT_TEST_TMPBASE" != x ]; then + tmpbase="$DGIT_TEST_TMPBASE" fi cd $tmp @@ -51,10 +55,6 @@ env -0 >$tmp/.save-env ln -f $troot/ssh ssh -mkdir -p $tmp/gnupg -cp $troot/gnupg/* $tmp/gnupg -chmod go-rw $tmp/gnupg/* - export DEBCHANGE_VENDOR=dpkg mkdir -p $tmp/incoming @@ -65,7 +65,7 @@ incoming = $tmp/incoming run_dinstall = 0 END -: ${tagpfx:=test-dummy} +: ${tagpfx:=archive/test-dummy} : ${suitespecs:=sid:unstable} t-git-next-date () { @@ -188,6 +188,8 @@ t-git-merge-base () { } t-has-ancestor () { + # t-has-ancestor ANCESTOR + # (CHILD is implicit, HEAD) local now=`git rev-parse HEAD` local ancestor=`git rev-parse $1^{}` local mbase=`t-git-merge-base $ancestor $now` @@ -196,6 +198,18 @@ t-has-ancestor () { fi } +t-has-parent-or-is () { + # t-has-parent-or-is CHILD PARENT + local child=$1 + local parent=$2 + local parents=$(git show --pretty=format:' %P %H ' "$child") + parent=$(git rev-parse "$parent~0") + case "$parents" in + *" $parent "*) ;; + *) fail "child $child lacks parent $parent" ;; + esac +} + t-prep-newpackage () { t-select-package $1 v=$2 @@ -228,7 +242,7 @@ t-archive-none () { >$tmp/aq/package.new.$p t-archive-updated new $p - ln -s $suite $tmp/aq/dsc_in_suite/$sname + ln -sf $suite $tmp/aq/dsc_in_suite/$sname cat <>$tmp/aq/suites $jsondelim @@ -278,7 +292,7 @@ t-archive-updated () { t-archive-process-incoming () { local suite=$1 - mv $tmp/incoming/${p}_${v}[._]* $tmp/mirror/pool/main/ + mv $tmp/incoming/${p}_* $tmp/mirror/pool/main/ t-archive-query "$suite" } @@ -379,7 +393,8 @@ t-setup-done () { local savedirs=$2 local importeval=$3 - exec 4>$tmp/IMPORT.new + local import=IMPORT.${0##*/} + exec 4>$tmp/$import.new local vn for vn in $savevars; do @@ -388,11 +403,11 @@ t-setup-done () { ' $vn "$(eval "printf '%s\n' \"\$$vn\"")" done - (set -e; cd $tmp; tar cf IMPORT.tar $savedirs) + (set -e; cd $tmp; tar cf $import.tar $savedirs) printf >&4 "\n%s\n" "$importeval" - mv -f $tmp/IMPORT.new $tmp/IMPORT + mv -f $tmp/$import.new $tmp/$import } t-setup-import () { @@ -410,7 +425,7 @@ t-setup-import () { lock="$setupsrc.lock" fi - local simport="$setupsrc/IMPORT" + local simport="$setupsrc/IMPORT.$setupname" if ! [ -e "$simport" ]; then with-lock-ex -w "$lock" \ @@ -474,17 +489,19 @@ t-ref-head () { t-ref-same-val () { local name="$1" local val=$2 - case "$t_ref_val" in - '') ;; + case "${t_ref_val-unset}" in + unset) ;; "$val") ;; - *) fail "ref varies: $name:\ - ${val:-nothing} != ${t_ref_val:-nothing}" ;; + *) fail "ref varies: ($name)\ + ${val:-nothing} != ${t_ref_val:-nothing} (${t_ref_names[*]})" ;; esac t_ref_val="$val" + t_ref_names+=("$name") } t-refs-same-start () { - t_ref_val='' + unset t_ref_val + t_ref_names=() } t-refs-same () { @@ -572,6 +589,7 @@ t-splitbrain-pushed-good--unpack () { mkdir t-unpack cd t-unpack ln -s $tmp/mirror/pool/main/*.orig*.tar* . + ln -s $tmp/incoming/*.orig*.tar* . ||: ln -s $incoming_dsc . ln -s ${incoming_dsc/.dsc/.debian.tar}* . dpkg-source "$@" -x *.dsc @@ -601,6 +619,13 @@ t-splitbrain-pushed-good-start () { git merge-base --is-ancestor $dep14tag $dgittag t-refs-same-start + t-ref-same refs/heads/split.p + case "$(t-git-get-ref refs/heads/split.b)" in + "$t_ref_val") ;; + "$(git rev-parse refs/heads/split.p^0)") ;; + "$(git rev-parse refs/heads/split.p^1)") ;; + *) fail 'bad b/p' ;; + esac t-pushed-good-core t-incoming-dsc @@ -696,11 +721,13 @@ t-stunt-envvar () { local var=$1 local tstunt=$2 eval ' - case "'$var'" in + case "$'$var'" in "$tstunt:"*) ;; *":$tstunt:"*) ;; + "") '$var'="$tstunt" ;; *) '$var'="$tstunt:$'$var'" ;; esac + export '$var' ' } @@ -762,7 +789,19 @@ t-gbp-unapplied-pq2qc () { git commit -m 'Commit patch queue' } -t-gbp-example-prep () { +t-git-pseudo-merge () { + # like git merge -s ours + if [ ! "$git_pseuomerge_opts" ]; then + if git merge --help \ + | grep -q allow-unrelated-histories; then + git_pseuomerge_opts='--allow-unrelated-histories' + fi + git_pseuomerge_opts+=' -s ours' + fi + git merge $git_pseuomerge_opts "$@" +} + +t-gbp-example-prep-no-ff () { t-tstunt-parsechangelog t-archive example 1.0-1 t-git-none @@ -772,7 +811,7 @@ t-gbp-example-prep () { t-dgit fetch - git-checkout -b patch-queue/quilt-tip-2 patch-queue/quilt-tip + git checkout -b patch-queue/quilt-tip-2 patch-queue/quilt-tip gbp pq rebase echo '/* some comment */' >>src.c @@ -782,8 +821,12 @@ t-gbp-example-prep () { t-gbp-unapplied-pq2qc t-commit 'some updates' 1.0-2 +} - git merge -s ours \ +t-gbp-example-prep () { + t-gbp-example-prep-no-ff + + t-git-pseudo-merge \ -m 'Pseudo-merge to make descendant of archive' \ remotes/dgit/dgit/sid } @@ -806,7 +849,7 @@ t-drs () { t-git-config dgit-distro.test-dummy.git-url "ext::$troot/drs-git-ext %S " t-git-config dgit-distro.test-dummy.git-check true t-git-config dgit-distro.test-dummy.git-create true - t-git-config dgit-distro.test-dummy.dgit-tag-format old,new + t-git-config dgit-distro.test-dummy.dgit-tag-format new,old,maint cp $troot/gnupg/{dd.gpg,dm.gpg,dm.txt} $tmp/. cp $troot/suites $tmp/. cp $troot/suites $tmp/suites-master @@ -833,6 +876,7 @@ t-newtag () { t-git-config dgit-distro.test-dummy.dgit-tag-format new,maint } t-oldtag () { + export tagpfx=test-dummy t-git-config dgit-distro.test-dummy.dgit-tag-format old } @@ -904,6 +948,7 @@ t-chain-test () { local d=${0%/*} cd $root export DGIT_TEST_TESTNAME="$testname" + export DGIT_TEST_TMPBASE="$tmpbase" export ADTTMP=$tmp exec "$d/$ct" } @@ -913,3 +958,8 @@ t-alt-test () { t-${t%%-*} t-chain-test "${t#*-}" } + +case "$0" in +*/gnupg) ;; +*) t-setup-import gnupg ;; +esac