summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-06-19 16:16:12 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-16 16:47:48 +0100
commitd3606ff36cbf24f80152c5848fefee0c62686486 (patch)
tree6f2656a9fdd56179508fe28788df5f91c8a48523 /tests
parent041c3de0db5da816fcbe5b8ac560946a058570bd (diff)
Test suite: unapplied-pq2qc: move into lib as a t- subroutine
Diffstat (limited to 'tests')
-rw-r--r--tests/lib22
-rwxr-xr-xtests/unapplied-pq2qc23
2 files changed, 22 insertions, 23 deletions
diff --git a/tests/lib b/tests/lib
index 48bc237..0b88362 100644
--- a/tests/lib
+++ b/tests/lib
@@ -512,6 +512,28 @@ t-apply-diff () {
| patch -p1 -u
}
+t-gbp-unapplied-pq2qc () {
+ # does `gbp pq export' (leaving us on BRANCH (eg "quilt-tip"))
+ # commits the resulting debian/patches on qc/BRANCH
+ # goes back to patch-queue/BRANCH
+ # qc/BRANCH is not fast-forwarding
+
+ gbp pq export
+
+ branch=`git symbolic-ref HEAD`
+ branch=${branch#refs/heads/}
+
+ case "$branch" in
+ */*) fail "unexpected branch $branch" ;;
+ esac
+
+ git branch -f qc/$branch
+ git checkout qc/$branch
+ git add debian/patches
+ git commit -m 'Commit patch queue'
+ git checkout patch-queue/$branch
+}
+
t-commit () {
local msg=$1
v=${2-1.$revision}
diff --git a/tests/unapplied-pq2qc b/tests/unapplied-pq2qc
deleted file mode 100755
index 03b2cdf..0000000
--- a/tests/unapplied-pq2qc
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-set -e
-fail () { echo >&2 "$0: $*"; exit 1; }
-
-# does `gbp pq export' (leaving us on BRANCH (eg "quilt-tip"))
-# commits the resulting debian/patches on qc/BRANCH
-# goes back to patch-queue/BRANCH
-# qc/BRANCH is not fast-forwarding
-
-gbp pq export
-
-branch=`git symbolic-ref HEAD`
-branch=${branch#refs/heads/}
-
-case "$branch" in
-*/*) fail "unexpected branch $branch" ;;
-esac
-
-git branch -f qc/$branch
-git checkout qc/$branch
-git add debian/patches
-git commit -m 'Commit patch queue'
-git checkout patch-queue/$branch