From 327f0472cbd61eed9092e03302647509392ef637 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 23 Oct 2016 16:32:12 +0100
Subject: [PATCH] Test suite: lib-orig-include-exclude: Prepare for more reuse

Support a suite argument to test-push-1 and dgit argument arguments to
test-push-2.  cd back to $tmp at the end.

No overall functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 tests/lib-orig-include-exclude | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/lib-orig-include-exclude b/tests/lib-orig-include-exclude
index 7c29c962..75a96563 100644
--- a/tests/lib-orig-include-exclude
+++ b/tests/lib-orig-include-exclude
@@ -21,14 +21,15 @@ cd $p
 test-push-1 () {
 	v=$1
 	ch=$2
+	suite=$3
 
-	t-commit $v $v
+	t-commit $v $v $suite
 	t-dgit $ch build
 }
 
 test-push-2 () {
 	$test_push_2_hook
-	t-dgit $ch push
+	t-dgit $ch "$@" push
 }
 
 test-push-1 1.0-2 --ch:-sa
@@ -58,3 +59,4 @@ cd get
 t-dgit clone $p
 # ^ checks that all the origs are there, ie that dgit added the origs
 
+cd ..
-- 
2.30.2