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: Test pushing with forcing old and new tag format
[dgit.git]
/
tests
/
lib
diff --git
a/tests/lib
b/tests/lib
index b4c1128c9a82f834b7490ff83e8750257fe56049..38605bd9359e2f9200b1d4737ef3f235f60887e7 100644
(file)
--- a/
tests/lib
+++ b/
tests/lib
@@
-7,6
+7,20
@@
set -o pipefail
. tests/lib-core
. tests/lib-restricts
. tests/lib-core
. tests/lib-restricts
+t-report-failure () {
+ set +x
+ rc=$1
+ cat <<END >&2
+TEST FAILED
+funcs: ${FUNCNAME[*]}
+lines: ${BASH_LINENO[*]}
+files: ${BASH_SOURCE[*]}
+END
+ exit 16
+}
+
+trap 'test $? = 0 || t-report-failure' EXIT
+
t-set-intree
: ${DGIT_TEST_DEBUG=-D}
t-set-intree
: ${DGIT_TEST_DEBUG=-D}
@@
-48,6
+62,8
@@
incoming = $tmp/incoming
run_dinstall = 0
END
run_dinstall = 0
END
+: ${tagpfx:=test-dummy}
+
t-git-next-date () {
GIT_COMMITTER_DATE="$(( ${GIT_COMMITTER_DATE%% *} + 1 )) ${GIT_COMMITTER_DATE#* }"
GIT_AUTHOR_DATE="$GIT_COMMITTER_DATE"
t-git-next-date () {
GIT_COMMITTER_DATE="$(( ${GIT_COMMITTER_DATE%% *} + 1 )) ${GIT_COMMITTER_DATE#* }"
GIT_AUTHOR_DATE="$GIT_COMMITTER_DATE"
@@
-385,7
+401,8
@@
t-ref-same-val () {
case "$t_ref_val" in
'') ;;
"$val") ;;
case "$t_ref_val" in
'') ;;
"$val") ;;
- *) fail "ref varies: $name: $val != $t_ref_val" ;;
+ *) fail "ref varies: $name:\
+ ${val:-nothing} != ${t_ref_val:-nothing}" ;;
esac
t_ref_val="$val"
}
esac
t_ref_val="$val"
}
@@
-412,7
+429,7
@@
t-refs-notexist () {
}
t-v-tag () {
}
t-v-tag () {
- echo refs/tags/
test-dummy
/${v//\~/_}
+ echo refs/tags/
$tagpfx
/${v//\~/_}
}
t-check-pushed-master () {
}
t-check-pushed-master () {
@@
-597,6
+614,14
@@
t-drs () {
ln -sf /bin/true $drs_dispatch/policy-hook
}
ln -sf /bin/true $drs_dispatch/policy-hook
}
+t-newtag () {
+ export tagpfx=archive/test-dummy
+ t-git-config dgit-distro.test-dummy.dgit-tag-format new
+}
+t-oldtag () {
+ t-git-config dgit-distro.test-dummy.dgit-tag-format old
+}
+
t-dsd () {
t-drs
t-git-config dgit-distro.test-dummy.ssh "$troot/dsd-ssh"
t-dsd () {
t-drs
t-git-config dgit-distro.test-dummy.ssh "$troot/dsd-ssh"