X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=f1ffa8b11563219b2f3082a591fca04ed4d16c9c;hb=33abcd4e771e0bd3129383eb56f4ba31ff82a24c;hp=6b31c9d8635504862328ffbb750e677b4c4da42e;hpb=723dddd1942c1e856f13a889717f9aa02ed38d8f;p=dgit.git

diff --git a/tests/lib b/tests/lib
index 6b31c9d8..f1ffa8b1 100644
--- a/tests/lib
+++ b/tests/lib
@@ -62,6 +62,8 @@ incoming		= $tmp/incoming
 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"
@@ -251,7 +253,8 @@ t-archive-updated () {
 			"filename" => "$4",
 		};
 		END {
-			print to_json \@v or die $!;
+			my $json = JSON->new->canonical();
+			print $json->encode(\@v) or die $!;
 		}
 	'
 }
@@ -399,7 +402,8 @@ t-ref-same-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"
 }
@@ -426,7 +430,7 @@ t-refs-notexist () {
 }
 
 t-v-tag () {
-	echo refs/tags/test-dummy/${v//\~/_}
+	echo refs/tags/$tagpfx/${v//\~/_}
 }
 
 t-check-pushed-master () {
@@ -611,6 +615,14 @@ t-drs () {
 	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"