chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit: import-dsc: New test for abs/rel dsc component links
[dgit.git]
/
tests
/
lib
diff --git
a/tests/lib
b/tests/lib
index e2496b43a0355d45f67fc345622df66705c8de33..fa553af9d5e89af67a971ad23617ff1eedbc376e 100644
(file)
--- a/
tests/lib
+++ b/
tests/lib
@@
-33,8
+33,10
@@
export DGIT_TEST_DEBUG
: ${DGIT_TEST_DISTRO+ ${distro=${DGIT_TEST_DISTRO}}}
: ${DGIT_TEST_DISTRO+ ${distro=${DGIT_TEST_DISTRO}}}
-export GIT_COMMITTER_DATE='1515000000 +0100'
-export GIT_AUTHOR_DATE='1515000000 +0100'
+export GIT_COMMITTER_DATE='1530000000 +0100'
+export GIT_AUTHOR_DATE='1530000000 +0100'
+
+export LC_CTYPE=C.UTF-8
root=`pwd`
troot=$root/tests
root=`pwd`
troot=$root/tests
@@
-62,10
+64,11
@@
t-set-using-tmp
test -f $tmp/.save-env || \
env -0 >$tmp/.save-env
test -f $tmp/.save-env || \
env -0 >$tmp/.save-env
-ln -f $troot/ssh ssh
+ln -
s
f $troot/ssh ssh
export DEBCHANGE_VENDOR=dpkg
unset VISUAL
export DEBCHANGE_VENDOR=dpkg
unset VISUAL
+unset GIT_EDITOR
mkdir -p $tmp/incoming
cat <<END >$tmp/dput.cf
mkdir -p $tmp/incoming
cat <<END >$tmp/dput.cf
@@
-91,7
+94,9
@@
t-expect-fail () {
local mpat="$1"; shift
set +o pipefail
local mpat="$1"; shift
set +o pipefail
- LC_MESSAGES=C "$@" 2>&1 | tee $tmp/t.output
+ LC_MESSAGES=${expect_fail_lcmessages-C} \
+ LANGUAGE=${expect_fail_lcmessages-C} \
+ "$@" 2>&1 | tee $tmp/t.output
local ps="${PIPESTATUS[*]}"
set -o pipefail
local ps="${PIPESTATUS[*]}"
set -o pipefail
@@
-341,7
+346,7
@@
t-archive () {
v=$2
local dscf=${p}_$2.dsc
rm -f $tmp/mirror/pool/main/${p}_*
v=$2
local dscf=${p}_$2.dsc
rm -f $tmp/mirror/pool/main/${p}_*
- ln $troot/pkg-srcs/${p}_${2%-*}* $tmp/mirror/pool/main/
+ ln
-s
$troot/pkg-srcs/${p}_${2%-*}* $tmp/mirror/pool/main/
t-archive-query $suite
rm -rf $tmp/extract
mkdir $tmp/extract
t-archive-query $suite
rm -rf $tmp/extract
mkdir $tmp/extract
@@
-403,6
+408,13
@@
t-git-fsck () {
esac
}
esac
}
+t-check-only-bpd () {
+ if [ "$bpd" = .. ]; then return; fi
+ t-files-notexist \
+ $tmp/*.{deb,changes,dsc,buildinfo} \
+ $tmp/*.{tar,diff}.*
+}
+
t-fscks () {
(
shopt -s nullglob
t-fscks () {
(
shopt -s nullglob
@@
-415,6
+427,7
@@
t-fscks () {
t-ok () {
: '========================================'
t-ok () {
: '========================================'
+ t-check-only-bpd
t-fscks
t-save-artifacts
echo ok.
t-fscks
t-save-artifacts
echo ok.
@@
-1025,6
+1038,15
@@
t-make-badcommit () {
t-expect-fsck-fail $badcommit
}
t-expect-fsck-fail $badcommit
}
+t-make-orig () {
+ # leaves ust set to filename of orig tarball
+ local p=$1
+ local v=$2
+ local tag=${3-v$2}
+ ust=${p}_${v}.orig.tar.gz
+ GZIP=-1 git archive -o $bpd/$ust --prefix=${p}-${v}/ $tag
+}
+
t-merge-conflicted-stripping-conflict-markers () {
local otherbranch=$1
local file=$2
t-merge-conflicted-stripping-conflict-markers () {
local otherbranch=$1
local file=$2
@@
-1040,7
+1062,8
@@
t-merge-conflicted-stripping-conflict-markers () {
t-commit () {
local msg=$1
v=${2:-${majorv:-1}.$revision}
t-commit () {
local msg=$1
v=${2:-${majorv:-1}.$revision}
- dch --force-distribution -v$v --distribution ${3:-unstable} "$1"
+ $troot/tstunt/debchange \
+ --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 ))
@@
-1057,7
+1080,7
@@
t-dch-commit-r () {
}
t-dch-commit () {
}
t-dch-commit () {
-
faketime @"${GIT_AUTHOR_DATE% *}" dch
"$@"
+
$troot/tstunt/debchange
"$@"
git commit -m "dch $*" debian/changelog
}
git commit -m "dch $*" debian/changelog
}