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>

diff --git a/tests/lib-orig-include-exclude b/tests/lib-orig-include-exclude
index 7c29c962116f90148de7493db04b0f4e604689a1..75a965630ac04b5c3627a8ddc04d31c231f24638 100644 (file)
--- 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
 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 build
 }
 
 test-push-2 () {
        $test_push_2_hook

-       t-dgit $ch push
+       t-dgit $ch "$@" push

 }
 
 test-push-1 1.0-2 --ch:-sa
 }
 
 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
 
 t-dgit clone $p
 # ^ checks that all the origs are there, ie that dgit added the origs
 

+cd ..