Test suite: build-mode-*: Check that right .changes comes out.

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

diff --git a/debian/changelog b/debian/changelog
index f36ae86ac360b7e02aaa10aafaf9b9429946494f..615176b97fbaa6a07749ffa4724fed7235111811 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ dgit (2.8~) unstable; urgency=low
     being an unusual object, in case dpkg-source doesn't.
   * When in split build mode for `gbp-build' or `build', run
     mergechanges as is required.  Closes:#841990.
+  * Test suite: build-mode-*: Check that right .changes comes out.
 
  --
 

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 00f3a0347433c39a11ba3a81ac1c10198369e755..30fbb5a9a4f792e660493489ba2ca3f7f057abf6 100644 (file)
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -143,6 +143,8 @@ bm-compute-expected () {
        done
 
        bm-report-test "SOURCE FILE" $e_source
+       bm-report-test "SOURCE IN CHANGES" $e_source
+       bm-report-test "DEBS IN CHANGES" expr "$e_targets" : '.*binary.*'
 
        exec 4>&-
 }
@@ -153,6 +155,8 @@ bm-run-one () {
        bmid="$act,$cleanmode,$branch"
        bmid=${bmid// /_}
 
+       rm -f ../${p}_{v}_*.changes
+
        heading="===== [$bmid] dgit $args ====="
 
        bmlog=$tmp/run.$bmid.output
@@ -194,6 +198,19 @@ bm-run-one () {
 
        bm-report-test "SOURCE FILE" [ -e $dsc ]
 
+       if [ $actual_status = success ]; then
+               local changes=$(echo ../example_${v}_*.changes)
+               case "$changes" in
+               *' '*)  fail "build generated ambiguous .changes: $changes" ;;
+               esac
+
+               perl -ne 'print if m/^files:/i ... m/^\S/' \
+                       <$changes >$changes.files
+
+               bm-report-test "SOURCE IN CHANGES" grep '\.dsc$' $changes.files
+               bm-report-test "DEBS IN CHANGES" grep '\.deb$' $changes.files
+       fi
+
        exec 4>&-
 
        $bm_quirk_before_diff