From d3606ff36cbf24f80152c5848fefee0c62686486 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 19 Jun 2016 16:16:12 +0100
Subject: [PATCH] Test suite: unapplied-pq2qc: move into lib as a t- subroutine

---
 tests/lib             | 22 ++++++++++++++++++++++
 tests/unapplied-pq2qc | 23 -----------------------
 2 files changed, 22 insertions(+), 23 deletions(-)
 delete mode 100755 tests/unapplied-pq2qc

diff --git a/tests/lib b/tests/lib
index 48bc2373..0b883626 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 03b2cdff..00000000
--- 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
-- 
2.30.2