summaryrefslogtreecommitdiff
path: root/tests/tests
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2019-07-06 23:12:44 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2019-07-07 11:18:17 +0100
commit33d81bfa8efdf69e6eb61d12e531d1600fe10fd3 (patch)
tree279d81cdb82d3d32b8968e4091bf2e85135ebda2 /tests/tests
parent3868d189b3251aa7f0c307d14dbf5280d808d475 (diff)
test suite: tagupl*: Run t-tagupl-settings in $p
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests')
-rwxr-xr-xtests/tests/tagupl4
-rwxr-xr-xtests/tests/tagupl-native4
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/tests/tagupl b/tests/tests/tagupl
index ebf2c9b..52c4a7a 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 7d79f06..cd6538e 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