summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-11-07 17:28:10 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-16 16:47:31 +0100
commitecbd050d62ca87c4298a1344c805db0b93c392e0 (patch)
treed7409f5d6215532d9250e3beebc37c8b7a4efdd1
parent79194f4a7a74b1d6fce6812e379315e0b0984833 (diff)
Test suite: Provide test for nonexistent --always-split-source-build
We are going to introduce this option soon. It is not supposed to actually have very much overall effect, although it will replumb the way dgit goes about making the source package. So the tests are just the same as the normal tests only with the additional option.
-rw-r--r--debian/tests/control2
-rw-r--r--tests/lib-build-modes9
-rwxr-xr-xtests/tests/build-modes-asplit5
-rwxr-xr-xtests/tests/build-modes-gbp-asplit5
4 files changed, 19 insertions, 2 deletions
diff --git a/debian/tests/control b/debian/tests/control
index 5e3dce1..60c6e09 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -16,7 +16,7 @@ Tests: mirror mirror-debnewgit mirror-private
Tests-Directory: tests/tests
Depends: dgit, dgit-infrastructure, devscripts, rsync
-Tests: build-modes clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast push-buildproductsdir push-newpackage push-nextdgit quilt quilt-singlepatch rpush tag-updates test-list-uptodate trustingpolicy-replay
+Tests: build-modes build-modes-asplit build-modes-gbp-asplit clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast push-buildproductsdir push-newpackage push-nextdgit quilt quilt-singlepatch rpush tag-updates test-list-uptodate trustingpolicy-replay
Tests-Directory: tests/tests
Depends: dgit, dgit-infrastructure, devscripts
diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index a0b4722..8fa263c 100644
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -97,7 +97,7 @@ bm-compute-expected () {
}
bm-run-one () {
- local args="--clean=$cleanmode $real_act"
+ local args="$DGIT_TEST_BM_BASEARGS --clean=$cleanmode $real_act"
bmid="$act,$cleanmode,$branch"
bmid=${bmid// /_}
@@ -158,3 +158,10 @@ bm-act-iterate () {
done
: 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}"
+}
diff --git a/tests/tests/build-modes-asplit b/tests/tests/build-modes-asplit
new file mode 100755
index 0000000..fa3bf8a
--- /dev/null
+++ b/tests/tests/build-modes-asplit
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+. tests/lib
+. $troot/lib-build-modes
+bm-alwayssplit
diff --git a/tests/tests/build-modes-gbp-asplit b/tests/tests/build-modes-gbp-asplit
new file mode 100755
index 0000000..fa3bf8a
--- /dev/null
+++ b/tests/tests/build-modes-gbp-asplit
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+. tests/lib
+. $troot/lib-build-modes
+bm-alwayssplit