chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test suite: import-nonnative: Test tarbombs
[dgit.git]
/
tests
/
lib
diff --git
a/tests/lib
b/tests/lib
index 03bb12da073636c7b17868cd2ddd895c847bd5f4..b033dde2f78040b5a55ea06dd781d8fb1db5a772 100644
(file)
--- a/
tests/lib
+++ b/
tests/lib
@@
-65,6
+65,7
@@
incoming = $tmp/incoming
run_dinstall = 0
END
run_dinstall = 0
END
+: ${t_archive_method:=aq}
: ${tagpfx:=archive/test-dummy}
: ${suitespecs:=sid:unstable}
: ${tagpfx:=archive/test-dummy}
: ${suitespecs:=sid:unstable}
@@
-198,11
+199,11
@@
t-has-ancestor () {
fi
}
fi
}
-t-has-parent () {
- # t-has-parent CHILD PARENT
+t-has-parent
-or-is
() {
+ # t-has-parent
-or-is
CHILD PARENT
local child=$1
local parent=$2
local child=$1
local parent=$2
- local parents=$(git show --pretty=format:' %P ' "$child")
+ local parents=$(git show --pretty=format:' %P
%H
' "$child")
parent=$(git rev-parse "$parent~0")
case "$parents" in
*" $parent "*) ;;
parent=$(git rev-parse "$parent~0")
case "$parents" in
*" $parent "*) ;;
@@
-226,6
+227,9
@@
t-prep-newpackage () {
t-archive-none () {
t-select-package $1
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
mkdir -p $tmp/aq/dsc_in_suite $tmp/mirror/pool/main
: >$tmp/aq/suites
@@
-237,10
+241,10
@@
t-archive-none () {
local sname=${suitespec#*:}
>$tmp/aq/package.$suite.$p
local sname=${suitespec#*:}
>$tmp/aq/package.$suite.$p
- t-archive-updated $suite $p
+ t-a
q-a
rchive-updated $suite $p
>$tmp/aq/package.new.$p
>$tmp/aq/package.new.$p
- t-archive-updated new $p
+ t-a
q-a
rchive-updated new $p
ln -sf $suite $tmp/aq/dsc_in_suite/$sname
ln -sf $suite $tmp/aq/dsc_in_suite/$sname
@@
-267,7
+271,7
@@
END
END
}
END
}
-t-archive-updated () {
+t-a
q-a
rchive-updated () {
local suite=$1
local p=$2
local suitedir=$tmp/aq/dsc_in_suite/$suite
local suite=$1
local p=$2
local suitedir=$tmp/aq/dsc_in_suite/$suite
@@
-299,9
+303,16
@@
t-archive-process-incoming () {
t-archive-query () {
local suite=${1-sid}
local dscf=main/${p}_${v}.dsc
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}
local sha=`sha256sum <$tmp/mirror/pool/$dscf`
echo "${v} ${sha% -} $dscf" >>$tmp/aq/package.$suite.${p}
- t-archive-updated $suite $p
+ t-a
q-a
rchive-updated $suite $p
}
t-archive () {
}
t-archive () {
@@
-310,7
+321,7
@@
t-archive () {
local dscf=${p}_$2.dsc
rm -f $tmp/mirror/pool/main/${p}_*
ln $troot/pkg-srcs/${p}_${2%-*}* $tmp/mirror/pool/main/
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)
rm -rf $tmp/extract
mkdir $tmp/extract
(set -e; cd $tmp/extract; dpkg-source -x ../mirror/pool/main/$dscf)
@@
-489,17
+500,19
@@
t-ref-head () {
t-ref-same-val () {
local name="$1"
local val=$2
t-ref-same-val () {
local name="$1"
local val=$2
- case "$
t_ref_val
" in
-
'')
;;
+ case "$
{t_ref_val-unset}
" in
+
unset)
;;
"$val") ;;
"$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"
esac
t_ref_val="$val"
+ t_ref_names+=("$name")
}
t-refs-same-start () {
}
t-refs-same-start () {
- t_ref_val=''
+ unset t_ref_val
+ t_ref_names=()
}
t-refs-same () {
}
t-refs-same () {
@@
-587,6
+600,7
@@
t-splitbrain-pushed-good--unpack () {
mkdir t-unpack
cd t-unpack
ln -s $tmp/mirror/pool/main/*.orig*.tar* .
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
ln -s $incoming_dsc .
ln -s ${incoming_dsc/.dsc/.debian.tar}* .
dpkg-source "$@" -x *.dsc
@@
-616,6
+630,13
@@
t-splitbrain-pushed-good-start () {
git merge-base --is-ancestor $dep14tag $dgittag
t-refs-same-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
t-pushed-good-core
t-incoming-dsc
@@
-824,7
+845,7
@@
t-gbp-example-prep () {
t-commit () {
local msg=$1
v=${2:-${majorv:-1}.$revision}
t-commit () {
local msg=$1
v=${2:-${majorv:-1}.$revision}
- dch -v$v --distribution ${3:-unstable} "$1"
+ dch -
-force-distribution -
v$v --distribution ${3:-unstable} "$1"
git add debian/changelog
debcommit
revision=$(( ${revision-0} + 1 ))
git add debian/changelog
debcommit
revision=$(( ${revision-0} + 1 ))