git-debrebase: breakwater_of: permit unclean to be an fproblem

[dgit.git] / tests / lib-build-modes

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 00f3a0347433c39a11ba3a81ac1c10198369e755..ee2975d04c10a74cd53159aec53a0938e02548e0 100644 (file)
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -86,7 +86,7 @@ bm-quirk-sbuild-after-act () {
        # run.  We know it must be running it in the chroot because we
        # provide sbuild with the dsc, not the tree, so we simply
        # ignore all executions of the clean target by schroot.
-       local arch=$(dpkg-architecture -qDEB_BUILD_ARCH)
+       local arch; arch=$(dpkg-architecture -qDEB_BUILD_ARCH)
        local sblog=../example_${v}_$arch.build
        if [ -e $sblog ]; then
                sed '
@@ -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; 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