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: clean_tree_check: Add a comment about modifed tracked files
[dgit.git]
/
tests
/
lib
diff --git
a/tests/lib
b/tests/lib
index 376585ca9cc02205a35f0dd39d1c8fd56577017d..a050522890c49fe8bed8076c7584a7ac2dfcc314 100644
(file)
--- a/
tests/lib
+++ b/
tests/lib
@@
-33,8
+33,8
@@
export DGIT_TEST_DEBUG
: ${DGIT_TEST_DISTRO+ ${distro=${DGIT_TEST_DISTRO}}}
: ${DGIT_TEST_DISTRO+ ${distro=${DGIT_TEST_DISTRO}}}
-export GIT_COMMITTER_DATE='15
15
000000 +0100'
-export GIT_AUTHOR_DATE='15
15
000000 +0100'
+export GIT_COMMITTER_DATE='15
30
000000 +0100'
+export GIT_AUTHOR_DATE='15
30
000000 +0100'
root=`pwd`
troot=$root/tests
root=`pwd`
troot=$root/tests
@@
-62,7
+62,7
@@
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
@@
-92,7
+92,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
@@
-342,7
+344,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
@@
-404,6
+406,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
@@
-416,6
+425,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.
@@
-1026,6
+1036,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