From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 6 Jul 2019 16:44:25 +0000 (+0100)
Subject: test suite: tagupl: Break out next-mangle
X-Git-Tag: archive/debian/9.1~48
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=86fc0e8b602a9a94dd7818f1a8c748a5a4ffc355;p=dgit.git

test suite: tagupl: Break out next-mangle

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/tests/tagupl b/tests/tests/tagupl
index c45f5e92..e1f43917 100755
--- a/tests/tests/tagupl
+++ b/tests/tests/tagupl
@@ -46,6 +46,11 @@ perl -i -ne '
 	print or die $!;
 ' ../basetag
 
+next-mangle () {
+	mv ../tagupl/overall.log ../tagupl/overall.log-$ident
+	ident=$1
+}
+
 with-mangled () {
 	local perl=$1
 	perl <../basetag >../badtag-$ident -pe "$perl"
@@ -55,8 +60,7 @@ with-mangled () {
 }
 
 expect-quit () {
-	mv ../tagupl/overall.log ../tagupl/overall.log-$ident
-	ident=$1
+	next-mangle "$1"
 	local perl=$2
 	local mstring=$3
 	with-mangled "$perl"