bm-prep () {
t-tstunt-parsechangelog
+ t-tstunt dpkg-deb
t-prep-newpackage example 1.0
dpkgbuildpackage_deps_for_clean=false
fi
- cleanmodes_default="git none dpkg-source dpkg-source-d"
+ 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
# 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 sblog=../example_1.0_$arch.build
+ 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 &/;
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
}
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
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>&-
}
bmid="$act,$cleanmode,$branch"
bmid=${bmid// /_}
+ rm -f $bpd/${p}_{v}_*.changes
+
heading="===== [$bmid] dgit $args ====="
bmlog=$tmp/run.$bmid.output
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
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-act-iterate done.
}
-bm-alwayssplit () {
- local t=${0##*/}
- DGIT_TEST_BM_BASEARGS+=' --always-split-source-build'
- export DGIT_TEST_BM_BASEARGS
- t-chain-test "${t%%-asplit}"
+bm-buildproductsdir-nonworking () {
+ t-git-config dgit.default.build-products-dir ../bpd-dummy
}
~ianmdlvl / dgit.git / blobdiff