From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 6 Jul 2019 22:12:44 +0000 (+0100)
Subject: test suite: tagupl*: Run t-tagupl-settings in $p
X-Git-Tag: archive/debian/9.1~21
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=33d81bfa8efdf69e6eb61d12e531d1600fe10fd3

test suite: tagupl*: Run t-tagupl-settings in $p

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

diff --git a/tests/tests/tagupl b/tests/tests/tagupl
index ebf2c9ba..52c4a7ab 100755
--- a/tests/tests/tagupl
+++ b/tests/tests/tagupl
@@ -12,8 +12,6 @@ t-worktree 1.0
 
 v=1.0-1
 
-t-tagupl-settings
-
 cd $p
 git checkout -b native 
 
@@ -24,6 +22,8 @@ git tag upstream/1.0
 
 git checkout -B master quilt-tip-2
 
+t-tagupl-settings
+
 upstream=$(git rev-parse upstream/1.0~0)
 tagname=test-dummy/$v
 
diff --git a/tests/tests/tagupl-native b/tests/tests/tagupl-native
index 7d79f06d..cd6538e6 100755
--- a/tests/tests/tagupl-native
+++ b/tests/tests/tagupl-native
@@ -12,11 +12,11 @@ t-worktree 1.1
 
 v=1.0-1
 
-t-tagupl-settings
-
 cd $p
 git checkout -B master
 
+t-tagupl-settings
+
 printf '%s\n' -sn >debian/source/options
 git add debian/source/options
 git rm -f debian/source/format