diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib-build-modes | 16 | ||||
| -rwxr-xr-x | tests/tests/build-modes-gbp | 1 | ||||
| -rwxr-xr-x | tests/tests/oldnewtagalt | 2 | ||||
| -rwxr-xr-x | tests/tests/push-source-with-changes | 2 |
4 files changed, 16 insertions, 5 deletions
diff --git a/tests/lib-build-modes b/tests/lib-build-modes index 232d322..837dde0 100644 --- a/tests/lib-build-modes +++ b/tests/lib-build-modes @@ -49,7 +49,7 @@ bm-gbp-example-acts () { bm-prep-ownpackage-branches for-build-modes - cleanmodes='git dpkg-source' + cleanmodes='git dpkg-source,no-check' for act in "$@"; do bm-guess-e-source-e-targets "$act" @@ -151,18 +151,28 @@ bm-compute-expected () { git) echo >&4 'BUILD-MODES PROGRAM git clean -xdf' ;; git-ff) 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|dpkg-source-d,no-check) echo >&4 "EXAMPLE RULES TARGET clean" ;; - dpkg-source) + dpkg-source|dpkg-source,no-check) bm-build-deps-ok || tolerate_fail=tolerate echo >&4 "EXAMPLE RULES TARGET clean" ;; none) ;; + Cdpkg-source*) ;; # handled below C*) echo "TODO bm eff_cleanmode=$eff_cleanmode" ;; *) 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 diff --git a/tests/tests/build-modes-gbp b/tests/tests/build-modes-gbp index d99b791..93d0811 100755 --- a/tests/tests/build-modes-gbp +++ b/tests/tests/build-modes-gbp @@ -21,6 +21,7 @@ quirk-clean-fixup () { } bm_quirk_before_diff=quirk-clean-fixup +cleanmodes_dpkgsource_extra=,no-check bm-prep for act in \ diff --git a/tests/tests/oldnewtagalt b/tests/tests/oldnewtagalt index 098fe19..6730918 100755 --- a/tests/tests/oldnewtagalt +++ b/tests/tests/oldnewtagalt @@ -9,7 +9,7 @@ cd $p test-push () { t-commit "$1" - t-dgit build-source + t-dgit -wgf build-source t-dgit push } diff --git a/tests/tests/push-source-with-changes b/tests/tests/push-source-with-changes index 580ea3a..2658485 100755 --- a/tests/tests/push-source-with-changes +++ b/tests/tests/push-source-with-changes @@ -20,7 +20,7 @@ t-dgit -C ../${p}_1.0_multi.changes push-source --new # (2) try pushing a source-only changes file -t-dgit --dpkg-buildpackage:-d build-source +t-dgit -wddn --dpkg-buildpackage:-d build-source t-dgit -C ../${p}_1.0_source.changes push-source --new t-pushed-good master |