diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-07-26 05:00:51 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-07-26 05:28:03 +0100 |
| commit | f0b46b0422f6ce3bb7c360ee3717eef95d621526 (patch) | |
| tree | 910472bbf8ce164f4ca8c07b88da2b18f82d03e6 /tests/tests | |
| parent | 599ee8fbfde3786781d36944caac72353aee99e3 (diff) | |
test suite: Honour DGIT_SCHROOT_CHROOT to set the schroot to use for the sbuild tests.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests')
| -rwxr-xr-x | tests/tests/build-modes-sbuild | 2 | ||||
| -rwxr-xr-x | tests/tests/quilt-gbp-build-modes-sbuild | 2 | ||||
| -rwxr-xr-x | tests/tests/sbuild-gitish | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/tests/build-modes-sbuild b/tests/tests/build-modes-sbuild index 19dcc8a..cda0783 100755 --- a/tests/tests/build-modes-sbuild +++ b/tests/tests/build-modes-sbuild @@ -9,7 +9,7 @@ t-restrict x-dgit-schroot-build bm_quirk_after_act=bm-quirk-sbuild-after-act bm-prep -act="sbuild -c build --no-arch-all" +act="sbuild -c $schroot --no-arch-all" real_act="$act" bm-guess-e-source-e-targets "$act" diff --git a/tests/tests/quilt-gbp-build-modes-sbuild b/tests/tests/quilt-gbp-build-modes-sbuild index 4c86bfe..ec1d1c7 100755 --- a/tests/tests/quilt-gbp-build-modes-sbuild +++ b/tests/tests/quilt-gbp-build-modes-sbuild @@ -7,6 +7,6 @@ t-dependencies sbuild t-restrict x-dgit-schroot-build bm-gbp-example-acts \ - 'sbuild -c build --arch-all' \ + "sbuild -c $schroot --arch-all" \ t-ok diff --git a/tests/tests/sbuild-gitish b/tests/tests/sbuild-gitish index 6e497b2..da90b6f 100755 --- a/tests/tests/sbuild-gitish +++ b/tests/tests/sbuild-gitish @@ -16,7 +16,7 @@ buildrune=$( next unless m/^ +\%/ .. 0; next if !m/\S/ .. 0; s/^ +\%//; - $fixchr += s/(\s-c\s*)jessie(\s|$)/$1build$2/; + $fixchr += s/(\s-c\s*)jessie(\s|$)/$1'"$schroot"'$2/; print or die $!; END { $fixchr == 1 or die $fixchr; } ' |