X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib-orig-include-exclude;h=104cf0b8bb1b3433dd9839a0b68a4d8add0cee9e;hp=7c29c962116f90148de7493db04b0f4e604689a1;hb=3ec15f5373c474cf3e0e55b876a565a09f81c793;hpb=3bbcd7f58885b839778ce9cca4e690c164306418

diff --git a/tests/lib-orig-include-exclude b/tests/lib-orig-include-exclude
index 7c29c962..104cf0b8 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
@@ -37,12 +38,17 @@ grep orig ../${p}_${v}_*.changes
 
 test-push-2
 
+origs_findls () {
+	find $tmp/mirror -name '*orig*' -ls \
+	| perl -pe 's/^(\s*\d+\s+\d+\s+\S+\s)\s*\d+(\s)/$1$2/'
+}
+
 # check that dgit stripped out the orig update
-find $tmp/mirror -name '*orig*' -ls >../before
+origs_findls >../before
 
 t-archive-process-incoming sid
 
-find $tmp/mirror -name '*orig*' -ls >../after
+origs_findls >../after
 diff -u ../before ../after
 
 test-push-1 1.1-1.2 --ch:-sd
@@ -58,3 +64,4 @@ cd get
 t-dgit clone $p
 # ^ checks that all the origs are there, ie that dgit added the origs
 
+cd ..