X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=332bef24414331a9bbd4f2774b1aabca5103dd0c;hp=e6ca6fb399b4a5b6167bbddd3bf4263606a037ea;hb=609f108165197b1d7a55a4908a321bad40a86442;hpb=df2685b0b8364f6dfed541113478bbd23a175a01

diff --git a/tests/lib b/tests/lib
index e6ca6fb3..332bef24 100644
--- a/tests/lib
+++ b/tests/lib
@@ -2,6 +2,7 @@
 
 exec 2>&1
 set -x
+set -o pipefail
 
 . tests/lib-core
 
@@ -43,9 +44,36 @@ END
 
 t-expect-fail () {
 	local mpat="$1"; shift
+
+	local grepper=fgrep
+	case "$mpat" in
+	[A-Z]:*)
+		case "$mpat" in
+		E:*)	grepper=egrep	;;
+		F:*)	grepper=fgrep	;;
+		*)	fail "bad mpat prefix in $mpat";;
+		esac
+		mpat=${mpat#[A-Z]:}
+		;;
+	esac
+
+	set +o pipefail
 	LC_MESSAGES=C "$@" 2>&1 | tee $tmp/t.output
-	test ${PIPESTATUS[0]} != 0
-	egrep "$mpat" $tmp/t.output ||false
+	local gotstatus=${PIPESTATUS[0]}
+	set -o pipefail
+	test $gotstatus != 0
+	$grepper -e "$mpat" $tmp/t.output ||false
+}
+
+t-reporefs () {
+	local whichoutput=$1; shift
+	local outputfile="$tmp/show-refs.$whichoutput"
+	(set -e
+	 exec >"$outputfile"
+	 if test -d $tmp/git/$p.git; then
+		cd $tmp/git/$p.git
+		git show-ref |sort
+	fi)
 }
 
 t-untar () {
@@ -225,7 +253,7 @@ t-cloned-fetched-good () {
 	t-refs-same \
 		refs/heads/dgit/sid \
 		refs/remotes/dgit/dgit/sid
-	t-refs-notexist dgit/unstable remotes/dgit/dgit/unstable
+	t-refs-notexist refs/dgit/unstable refs/remotes/dgit/dgit/unstable
 }
 
 t-output () {
@@ -241,7 +269,11 @@ t-clean-on-branch () {
 
 t-git-get-ref () {
 	local ref=$1
-	git show-ref -d $1 | perl -ne '
+	case "$ref" in
+	refs/*)	;;
+	*) fail "t-git-get-ref bad $ref" ;;
+	esac
+	(git show-ref -d $1 || test $? = 1) | perl -ne '
 		$x = $1 if m#^(\w+) \Q'$1'\E(?:\^\{\})?$#;
 		END { print "$x\n" if length $x; }
 	'
@@ -366,8 +398,9 @@ t-ref-dsc-dgit () {
 t-apply-diff () {
 	local v1=$1
 	local v2=$2
-	(cd $troot/pkg-srcs; debdiff ${p}_${v1}.dsc ${p}_${v2}.dsc) \
-		| patch -p1 -u
+	(cd $troot/pkg-srcs;
+	 debdiff ${p}_${v1}.dsc ${p}_${v2}.dsc || test $? = 1) \
+	 | patch -p1 -u
 }
 
 t-commit () {