From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 30 Jun 2019 11:16:47 +0000 (+0100)
Subject: test suite: baredebian-multitar: Check tarball import structure
X-Git-Tag: archive/debian/9.0~31
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=de2f667ab9664f312a2f66089f5253e38c984625

test suite: baredebian-multitar: Check tarball import structure

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/tests/baredebian-multitar b/tests/tests/baredebian-multitar
index 74ad64af..9ce59575 100755
--- a/tests/tests/baredebian-multitar
+++ b/tests/tests/baredebian-multitar
@@ -20,4 +20,26 @@ git tag -d $uvtag
 
 baredebian-test-core
 
+combine=$(
+	git log --pretty=format:%H \
+	--grep "Combine orig tarballs for example $uv" split.p
+)
+
+parentnum=0
+for comp in '' $xorigcomps; do
+	parentnum=$(( $parentnum + 1 ))
+	fn=${origbase}${comp:+-}${comp}.tar.gz
+
+	git checkout --orphan imp$parentnum
+	git rm -rf .
+	tar --strip-components=1 -axf ../$fn
+	git add -Af .
+
+	git commit -m P$parentnum
+	git diff --stat --exit-code $combine^$parentnum
+
+	count=$(git log $combine^$parentnum | grep -Fc $fn)
+	[ $count = 2 ]
+done
+
 t-ok