X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib-build-modes;h=30fbb5a9a4f792e660493489ba2ca3f7f057abf6;hp=00f3a0347433c39a11ba3a81ac1c10198369e755;hb=50419637c2d62d5368a52b6ddb3011f6a75b3b0d;hpb=69c8de09ff5cb507a7628282d346c2c8fd487a86 diff --git a/tests/lib-build-modes b/tests/lib-build-modes index 00f3a034..30fbb5a9 100644 --- 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