X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib-build-modes;h=27c5b06ca6abc5f1f9fde4488ee309b9f40f5953;hp=836d1ecef921e6c8e2ac30fa146691812fb3575f;hb=3138c37d23daef09e7bcd4627f4fca5ea77ccf3b;hpb=cfec91c99eff2ed5d6e914b54ef81d9ddca78ca8 diff --git a/tests/lib-build-modes b/tests/lib-build-modes index 836d1ece..27c5b06c 100644 --- a/tests/lib-build-modes +++ b/tests/lib-build-modes @@ -1,6 +1,20 @@ +bm-prep-ownpackage-branches () { + cat <<'END' >$tmp/stunt-git +#!/bin/sh -e +case "$*" in +*clean*) echo >&2 "BUILD-MODES PROGRAM git $*" ;; +esac +exec git "$@" +END + chmod +x $tmp/stunt-git + + bm_branches="$1" +} + bm-prep () { t-tstunt-parsechangelog + t-tstunt dpkg-deb t-prep-newpackage example 1.0 @@ -11,16 +25,7 @@ bm-prep () { -i debian/control git commit -a -m bad-build-deps - cat <<'END' >$tmp/stunt-git -#!/bin/sh -e -case "$*" in -*clean*) echo >&2 "BUILD-MODES PROGRAM git $*" ;; -esac -exec git "$@" -END - chmod +x $tmp/stunt-git - - counter=0 + bm-prep-ownpackage-branches 'indep-arch bad-build-deps' if zgrep 'dpkg-buildpackage: Make dependency checks fatal for -S' \ /usr/share/doc/dpkg-dev/changelog.gz; then @@ -28,33 +33,87 @@ END else dpkgbuildpackage_deps_for_clean=false fi + + cleanmodes_default="git none" + cleanmodes_default+=" dpkg-source$cleanmodes_dpkgsource_extra" + cleanmodes_default+=" dpkg-source-d$cleanmodes_dpkgsource_extra" + cleanmodes_all="$cleanmodes_default git-ff check" + cleanmodes_all+=" git,always git,always" + cleanmodes="$cleanmodes_default" +} + +bm-gbp-example-acts () { + t-gbp-example-prep + + git checkout -b for-build-modes qc/quilt-tip-2 + # build-modes cannot cope with branches containing / + + bm-prep-ownpackage-branches for-build-modes + + cleanmodes='git dpkg-source,no-check' + + for act in "$@"; do + bm-guess-e-source-e-targets "$act" + real_act="--quilt=gbp $act" + case "$act" in + sbuild*) bm_quirk_after_act=bm-quirk-sbuild-after-act ;; + gbp-*) real_act="$real_act --git-ignore-branch" ;; + *) bm_quirk_after_act='' ;; + esac + bm-act-iterate + done } bm-guess-e-source-e-targets () { local some_act=$1 case "$some_act" in + sbuild*" --no-arch-all"*) + e_source=true; e_targets='build-arch binary-arch' ;; + build-source) + e_source=true; e_targets='' ;; *" -b") e_source=false; e_targets='build binary' ;; *" -B") e_source=false; e_targets='build-arch binary-arch' ;; *" -A") e_source=false; e_targets='build-indep binary-indep' ;; *" -S") e_source=true; e_targets=' ' ;; *" -F") e_source=true; e_targets='build binary' ;; + *" -G") e_source=true; e_targets='build-arch binary-arch' ;; + *" -g") e_source=true; e_targets='build-indep binary-indep' ;; *) e_source=true; e_targets='build binary' ;; esac } +bm-quirk-sbuild-after-act () { + # sbuild likes to run the package clean target in the chroot, + # which isn't necessary in our case. We don't disable it in + # dgit because we want to do what sbuild does, in case there + # are packages which don't build unless their clean target was + # 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; arch=$(dpkg-architecture -qDEB_BUILD_ARCH) + local sblog=$bpd/example_${v}_$arch.build + if [ -e $sblog ]; then + sed ' + s/^EXAMPLE RULES TARGET clean/HOOK SUPPRESSED &/; + ' <$sblog >>$bmlog + else + echo "SBUILD LOG FILE ($sblog) MISSING" + fi +} -bm-report-source () { +bm-report-test () { + local desc=$1; shift if "$@"; then - echo >&4 "SOURCE EXISTS" + echo >&4 "$desc EXISTS" else - echo >&4 "SOURCE MISSING" + echo >&4 "$desc MISSING" fi } bm-build-deps-ok () { case "$branch" in - indep-arch) return 0 ;; - bad-build-deps) return 1 ;; + *bad-build-deps*) return 1 ;; + *) return 0 ;; esac } @@ -65,18 +124,58 @@ bm-compute-expected () { exec 4>$bmexp echo >&4 "$heading" - case $cleanmode in - git) echo >&4 'BUILD-MODES PROGRAM git clean -xdf' ;; - git-ff) echo >&4 'BUILD-MODES PROGRAM git clean -xdff' ;; - check) echo >&4 'BUILD-MODES PROGRAM git clean -xdn' ;; - dpkg-source-d) echo >&4 "EXAMPLE RULES TARGET clean" ;; - dpkg-source) bm-build-deps-ok || tolerate_fail=tolerate + local eff_cleanmode=$cleanmode + + case "$e_targets" in + *[^\ ]*) + ;; + *) + # if no build is going to be run, dgit will only check + # cleanliness rather than actually cleaning + eff_cleanmode=C$cleanmode + ;; + esac + + case "$act" in + sbuild*) + # dgit sbuild will only check cleanliness + # because it doesn't need to to make a .dsc for sbuild + eff_cleanmode=C$cleanmode + ;; + esac + + # we are running the builder in-tree ? + # when we have --include-dirty, we will want to check + # that too and reset eff_cleanmode to $cleanmode + + case $eff_cleanmode in + git|Cgit,always) + echo >&4 'BUILD-MODES PROGRAM git clean -xdf' ;; + git-ff|Cgit-ff,always) + echo >&4 'BUILD-MODES PROGRAM git clean -xdff' ;; + check|Ccheck) echo >&4 'BUILD-MODES PROGRAM git clean -dn -x' ;; + dpkg-source-d|dpkg-source-d,no-check) echo >&4 "EXAMPLE RULES TARGET clean" ;; - none) ;; + dpkg-source|dpkg-source,no-check) + bm-build-deps-ok || tolerate_fail=tolerate + echo >&4 "EXAMPLE RULES TARGET clean" + ;; + none|Cnone) ;; + Cdpkg-source*) ;; # handled below + Cgit|Cgit-ff) echo >&4 'BUILD-MODES PROGRAM git clean -dn' ;; *) fail "t-compute-expected-run $cleanmode ??" ;; esac + case $eff_cleanmode in + dpkg-source|Cdpkg-source|dpkg-source-d|Cdpkg-source-d) + echo >&4 'BUILD-MODES PROGRAM git clean -dn' + ;; + dpkg-source*,no-check|Cdpkg-source*,no-check) + ;; + Cdpkg-source*) fail "t-compute-expected-run wd $cleanmode ??" ;; + esac + if [ "x$e_targets" != x ]; then # e_targets can be " " to mean `/may/ fail due to b-d' bm-build-deps-ok || tolerate_fail=tolerate @@ -87,29 +186,37 @@ bm-compute-expected () { echo >&4 "EXAMPLE RULES TARGET $t" done - bm-report-source $e_source + 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>&- } bm-run-one () { - local args="--clean=$cleanmode $real_act" + local args="$DGIT_TEST_BM_BASEARGS --clean=$cleanmode $real_act" - heading="===== [$counter $branch $cleanmode $act] dgit $args =====" + bmid="$act,$cleanmode,$branch" + bmid=${bmid// /_} - bmlog=$tmp/run-$counter-output - bmexp=$tmp/run-$counter-expected - bmgot=$tmp/run-$counter-results + rm -f $bpd/${p}_{v}_*.changes + + heading="===== [$bmid] dgit $args =====" + + bmlog=$tmp/run.$bmid.output + bmexp=$tmp/run.$bmid.expected + bmgot=$tmp/run.$bmid.results bm-compute-expected git checkout $branch + git clean -xdf # since we might not do any actual cleaning - dsc='../example_1.0.dsc' + dsc="$bpd/example_$v.dsc" rm -f $dsc set +o pipefail - t-dgit --git=$tmp/stunt-git $args 2>&1 | tee $bmlog + t-dgit --rm-old-changes --git=$tmp/stunt-git $args 2>&1 | tee $bmlog local ps="${PIPESTATUS[*]}" set -o pipefail @@ -133,23 +240,37 @@ bm-run-one () { egrep >&4 '^EXAMPLE RULES TARGET|^BUILD-MODES' $bmlog || [ $? = 1 ] - bm-report-source [ -e $dsc ] + bm-report-test "SOURCE FILE" [ -e $dsc ] + + if [ $actual_status = success ]; then + local changes; changes=$(echo $bpd/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 [ $actual_status = failure ] || diff -U10 $bmexp $bmgot - - counter=$(( $counter + 1 )) } bm-act-iterate () { - for cleanmode in git none dpkg-source dpkg-source-d; do - # git-ff check removed because they're really very similar - for branch in indep-arch bad-build-deps; do + for cleanmode in $cleanmodes; do + for branch in $bm_branches; do bm-run-one done done : bm-act-iterate done. } + +bm-buildproductsdir-nonworking () { + t-git-config dgit.default.build-products-dir ../bpd-dummy +}