Test suite: orig-include-exclude: Move bulk into a lib-*

We're going to want to re-use it as-is.  Well, modulo the introduction
of $test_push_2_hook.

No 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
new file mode 100644 (file)
index 0000000..7c29c96
--- /dev/null
+++ b/tests/lib-orig-include-exclude
@@ -0,0 +1,60 @@
+# designed to be .'d
+
+t-tstunt-parsechangelog
+
+t-archive example 1.0-1
+t-git-none
+
+t-dgit clone $p
+
+origs='orig orig-docs'
+usvsns='1.0 1.1'
+
+for o in $origs; do
+       cp ${p}_{1.0,1.1}.${o}.tar.gz
+done
+
+mkdir -p "$tmp/aq/file_in_archive/%"
+
+cd $p
+
+test-push-1 () {
+       v=$1
+       ch=$2
+
+       t-commit $v $v
+       t-dgit $ch build
+}
+
+test-push-2 () {
+       $test_push_2_hook
+       t-dgit $ch push
+}
+
+test-push-1 1.0-2 --ch:-sa
+
+grep orig ../${p}_${v}_*.changes
+
+test-push-2
+
+# check that dgit stripped out the orig update
+find $tmp/mirror -name '*orig*' -ls >../before
+
+t-archive-process-incoming sid
+
+find $tmp/mirror -name '*orig*' -ls >../after
+diff -u ../before ../after
+
+test-push-1 1.1-1.2 --ch:-sd
+
+test-push-2
+
+t-archive-process-incoming sid
+
+cd ..
+mkdir get
+cd get
+
+t-dgit clone $p
+# ^ checks that all the origs are there, ie that dgit added the origs
+

diff --git a/tests/tests/orig-include-exclude b/tests/tests/orig-include-exclude
index 027600611a7347f211b2c287f3ae491b3bf805b3..b7c7f7fd57fb312418cae1057d5403f239cee1dd 100755 (executable)
--- a/tests/tests/orig-include-exclude
+++ b/tests/tests/orig-include-exclude
@@ -2,56 +2,6 @@
 set -e
 . tests/lib
 
-t-tstunt-parsechangelog
-
-t-archive example 1.0-1
-t-git-none
-
-t-dgit clone $p
-
-for o in orig orig-docs; do
-       cp ${p}_{1.0,1.1}.${o}.tar.gz
-done
-
-cd $p
-
-test-push-1 () {
-       v=$1
-       ch=$2
-
-       t-commit $v $v
-       t-dgit $ch build
-}
-
-test-push-2 () {
-       t-dgit $ch push
-}
-
-test-push-1 1.0-2 --ch:-sa
-
-grep orig ../${p}_${v}_*.changes
-
-test-push-2
-
-# check that dgit stripped out the orig update
-find $tmp/mirror -name '*orig*' -ls >../before
-
-t-archive-process-incoming sid
-
-find $tmp/mirror -name '*orig*' -ls >../after
-diff -u ../before ../after
-
-test-push-1 1.1-1.2 --ch:-sd
-
-test-push-2
-
-t-archive-process-incoming sid
-
-cd ..
-mkdir get
-cd get
-
-t-dgit clone $p
-# ^ checks that all the origs are there, ie that dgit added the origs
+. $troot/lib-orig-include-exclude
 
 echo done.