From 3bbcd7f58885b839778ce9cca4e690c164306418 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 23 Oct 2016 01:39:34 +0100
Subject: 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>
---
 tests/tests/orig-include-exclude | 52 +---------------------------------------
 1 file changed, 1 insertion(+), 51 deletions(-)

(limited to 'tests/tests/orig-include-exclude')

diff --git a/tests/tests/orig-include-exclude b/tests/tests/orig-include-exclude
index 0276006..b7c7f7f 100755
--- 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.
-- 
cgit v1.2.3