trap 'test $? = 0 || t-report-failure' EXIT
+t-filter-out-git-hyphen-dir
+
t-set-intree
: ${DGIT_TEST_DEBUG=-D}
tmp=$ADTTMP
if [ x"$tmp" = x ]; then
mkdir -p tests/tmp
+ tmpbase=$troot/tmp
tmp=tests/tmp/$testname
rm -rf $tmp
mkdir $tmp
+elif [ "x$DGIT_TEST_TMPBASE" != x ]; then
+ tmpbase="$DGIT_TEST_TMPBASE"
fi
cd $tmp
t-set-using-tmp
-ln -f $troot/ssh ssh
+env -0 >$tmp/.save-env
-mkdir -p $tmp/gnupg
-cp $troot/gnupg/* $tmp/gnupg
-chmod go-rw $tmp/gnupg/*
+ln -f $troot/ssh ssh
export DEBCHANGE_VENDOR=dpkg
run_dinstall = 0
END
-: ${tagpfx:=test-dummy}
+: ${t_archive_method:=aq}
+: ${tagpfx:=archive/test-dummy}
: ${suitespecs:=sid:unstable}
t-git-next-date () {
}
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`
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
t-archive-none () {
t-select-package $1
+ t-archive-none-$t_archive_method
+}
+t-archive-none-aq () {
mkdir -p $tmp/aq/dsc_in_suite $tmp/mirror/pool/main
: >$tmp/aq/suites
local sname=${suitespec#*:}
>$tmp/aq/package.$suite.$p
- t-archive-updated $suite $p
+ t-aq-archive-updated $suite $p
>$tmp/aq/package.new.$p
- t-archive-updated new $p
+ t-aq-archive-updated new $p
- ln -s $suite $tmp/aq/dsc_in_suite/$sname
+ ln -sf $suite $tmp/aq/dsc_in_suite/$sname
cat <<END >>$tmp/aq/suites
$jsondelim
END
}
-t-archive-updated () {
+t-aq-archive-updated () {
local suite=$1
local p=$2
local suitedir=$tmp/aq/dsc_in_suite/$suite
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"
}
t-archive-query () {
local suite=${1-sid}
local dscf=main/${p}_${v}.dsc
+ t-archive-query-$t_archive_method "$suite" "$p" "$v" "$dscf"
+}
+t-archive-query-aq () {
+ local suite=$1
+ local p=$2
+ local v=$3
+ local dscf=$4
local sha=`sha256sum <$tmp/mirror/pool/$dscf`
echo "${v} ${sha% -} $dscf" >>$tmp/aq/package.$suite.${p}
- t-archive-updated $suite $p
+ t-aq-archive-updated $suite $p
}
t-archive () {
local dscf=${p}_$2.dsc
rm -f $tmp/mirror/pool/main/${p}_*
ln $troot/pkg-srcs/${p}_${2%-*}* $tmp/mirror/pool/main/
- t-archive-query
+ t-archive-query $suite
rm -rf $tmp/extract
mkdir $tmp/extract
(set -e; cd $tmp/extract; dpkg-source -x ../mirror/pool/main/$dscf)
{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
$dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
-dtest-dummy $DGIT_TEST_OPTS $DGIT_TEST_DEBUG \
- -k39B13D8A "$@"
+ -k39B13D8A $t_dgit_xopts "$@"
: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
'
}
}
t-output () {
- printf "%s\n" "$1" >$tmp/t.want
+ printf "%s${1:+\n}" "$1" >$tmp/t.want
shift
"$@" >$tmp/t.got
diff $tmp/t.want $tmp/t.got
t-output "## $1" git status -b --porcelain
}
+t-setup-done () {
+ local savevars=$1
+ local savedirs=$2
+ local importeval=$3
+
+ local import=IMPORT.${0##*/}
+ exec 4>$tmp/$import.new
+
+ local vn
+ for vn in $savevars; do
+ perl >&4 -I. -MDebian::Dgit -e '
+ printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1]
+ ' $vn "$(eval "printf '%s\n' \"\$$vn\"")"
+ done
+
+ (set -e; cd $tmp; tar cf $import.tar $savedirs)
+
+ printf >&4 "\n%s\n" "$importeval"
+
+ mv -f $tmp/$import.new $tmp/$import
+}
+
+t-setup-import () {
+ local setupname=$1
+
+ local setupsrc
+ local lock
+ if [ "x$tmpbase" = x ]; then
+ # ADTTMP was set on entry to tests/lib, so we
+ # are not sharing tmp area between tests
+ setupsrc="$tmp"
+ lock="$tmp/.dummy.lock"
+ else
+ setupsrc="$tmpbase/$setupname"
+ lock="$setupsrc.lock"
+ fi
+
+ local simport="$setupsrc/IMPORT.$setupname"
+
+ if ! [ -e "$simport" ]; then
+ with-lock-ex -w "$lock" \
+ xargs -0 -a $tmp/.save-env \
+ bash -xec '
+ cd "$1"; shift
+ setupname="$1"; shift
+ simport="$1"; shift
+ if [ -e "$simport" ]; then exit 0; fi
+ env - "$@" \
+ "tests/setup/$setupname"
+ ' x "$root" "$setupname" "$simport"
+ fi
+
+ if [ "x$setupsrc" != "x$tmp" ]; then
+ (set -e; cd $tmp; tar xf "$simport.tar")
+ fi
+
+ . "$simport"
+}
+
t-git-get-ref-exact () {
local ref=$1
# does not dereference, unlike t-git-get-ref
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 () {
echo refs/tags/$tagpfx/${v//\~/_}
}
+t-format-ref () {
+ git log -n1 --pretty=format:"$1" "$2"
+}
+
+t-sametree-parent () {
+ local ref=$1
+ local parent
+ local ctree=$(t-format-ref '%T' "$ref")
+ while :; do
+ local psame=''
+ for parent in $(t-format-ref '%P' "$ref"); do
+ local ptree=$(t-format-ref '%T' "$parent")
+ if [ "x$ptree" = "x$ctree" ]; then
+ psame+=" $parent"
+ fi
+ done
+ case "$psame" in ""|" * *") break ;; esac
+ ref="${psame# }"
+ done
+ echo "$ref"
+}
+
t-check-pushed-master () {
local master=`t-git-get-ref refs/heads/master`
if [ x$master = x$t_ref_val ]; then return; fi
t-pushed-good () {
local branch=$1
local suite=${2:-sid}
+ t-refs-same \
+ refs/heads/$branch
+ t-pushed-good-core
+}
+
+t-pushed-good-core () {
t-ref-dsc-dgit
t-refs-same \
- refs/heads/$branch \
`t-v-tag` \
refs/remotes/dgit/dgit/$suite
t-refs-notexist \
git verify-tag `t-v-tag`
}
+t-splitbrain-pushed-good--unpack () {
+ cd $tmp
+ rm -rf t-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
+ cd */.
+ git init
+ git fetch ../../$p "refs/tags/*:refs/tags/*"
+}
+
+t-splitbrain-pushed-good--checkprep () {
+ git add -Af .
+ git rm --cached -r --ignore-unmatch .pc
+}
+
+t-splitbrain-pushed-good--checkdiff () {
+ local tag=$1
+ t-splitbrain-pushed-good--checkprep
+ t-output "" git diff --stat --cached $tag
+}
+
+t-splitbrain-pushed-good-start () {
+ dep14tag=refs/tags/test-dummy/${v//\~/_}
+ dgittag=$(t-v-tag)
+ t-output "" git status --porcelain
+ t-ref-head
+ t-refs-same $dep14tag
+ (set -e; cd $dgitrepo; t-refs-same $dep14tag)
+ 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
+
+ t-splitbrain-pushed-good--unpack
+ t-splitbrain-pushed-good--checkdiff $dgittag
+}
+t-splitbrain-pushed-good-end-made-dep14 () {
+ t-splitbrain-pushed-good--checkdiff $dep14tag
+ cd $tmp/$p
+}
+
+t-splitbrain-rm-gitignore-patch () {
+ perl -i -pe '
+ next unless $_ eq "auto-gitignore\n";
+ die if $counter++;
+ chomp;
+ rename "debian/patches/$_", "../t-auto-gitignore" or die $!;
+ $_ = "";
+ ' debian/patches/series
+}
+
+t-gbp-pushed-good () {
+ local suite=${1:-sid}
+ t-splitbrain-pushed-good-start
+
+ # Right, now we want to check that the maintainer tree and
+ # the dgit tree differ in exactly the ways we expect. We
+ # achieve this by trying to reconstruct the maintainer tree
+ # from the dgit tree.
+
+ # So, unpack it withut the patches applied
+ t-splitbrain-pushed-good--unpack --skip-patches
+
+ # dgit might have added a .gitignore patch, which we need to
+ # drop and remove
+ t-splitbrain-rm-gitignore-patch
+
+ # Now the result should differ only in non-debian/ .gitignores
+ t-splitbrain-pushed-good--checkprep
+ git diff --cached --name-only $dep14tag >../changed
+ perl -ne '
+ next if !m#^debian/# && m#(^|/)\.gitignore#;
+ die "$_ mismatch";
+ ' <../changed
+
+ # If we actually apply the gitignore patch by hand, it
+ # should be perfect:
+ if [ -f ../t-auto-gitignore ]; then
+ patch --backup-if-mismatch -p1 -u <../t-auto-gitignore
+ fi
+
+ t-splitbrain-pushed-good-end-made-dep14
+}
+
+t-unapplied-pushed-good () {
+ t-splitbrain-pushed-good-start
+ t-splitbrain-pushed-good--unpack --skip-patches
+ t-splitbrain-pushed-good-end-made-dep14
+}
+
+t-dpm-pushed-good () {
+ t-splitbrain-pushed-good-start
+ t-splitbrain-pushed-good--unpack
+ t-splitbrain-rm-gitignore-patch
+ t-splitbrain-pushed-good-end-made-dep14
+}
+
t-commit-build-push-expect-log () {
local msg=$1
local mpat=$2
local var=$1
local tstunt=$2
eval '
- case "'$var'" in
+ case "$'$var'" in
"$tstunt:"*) ;;
*":$tstunt:"*) ;;
+ "") '$var'="$tstunt" ;;
*) '$var'="$tstunt:$'$var'" ;;
esac
+ export '$var'
'
}
t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm
}
-t-ref-dsc-dgit () {
+t-incoming-dsc () {
local dsc=${p}_${v}.dsc
- local val=`t-822-field $tmp/incoming/$dsc Dgit`
- perl -e '$_=shift @ARGV; die "$dsc Dgit $_ ?" unless m/^\w+\b/;' "$val"
- t-ref-same-val $dsc "$val"
+ incoming_dsc=$tmp/incoming/$dsc
+}
+
+t-ref-dsc-dgit () {
+ t-incoming-dsc
+ local val=`t-822-field $incoming_dsc Dgit`
+ perl -e '$_=shift @ARGV; die "Dgit $_ ?" unless m/^\w+\b/;' "$val"
+ t-ref-same-val $incoming_dsc "$val"
}
t-apply-diff () {
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
t-worktree 1.0
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
t-gbp-unapplied-pq2qc
t-commit 'some updates' 1.0-2
+}
+
+t-gbp-example-prep () {
+ t-gbp-example-prep-no-ff
- git merge -s ours \
+ t-git-pseudo-merge \
-m 'Pseudo-merge to make descendant of archive' \
remotes/dgit/dgit/sid
}
t-commit () {
local msg=$1
- v=${2-1.$revision}
- dch -v$v --distribution unstable "$1"
+ v=${2:-${majorv:-1}.$revision}
+ dch --force-distribution -v$v --distribution ${3:-unstable} "$1"
git add debian/changelog
debcommit
revision=$(( ${revision-0} + 1 ))
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
t-newtag () {
export tagpfx=archive/test-dummy
- t-git-config dgit-distro.test-dummy.dgit-tag-format new
+ 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
}
local d=${0%/*}
cd $root
export DGIT_TEST_TESTNAME="$testname"
+ export DGIT_TEST_TMPBASE="$tmpbase"
export ADTTMP=$tmp
exec "$d/$ct"
}
t-${t%%-*}
t-chain-test "${t#*-}"
}
+
+case "$0" in
+*/gnupg) ;;
+*) t-setup-import gnupg ;;
+esac
~ianmdlvl / dgit.git / blobdiff