chiark / gitweb /
test suite: Honour DGIT_SCHROOT_CHROOT to set the schroot to use for the sbuild tests.
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 26 Jul 2018 04:00:51 +0000 (05:00 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 26 Jul 2018 04:28:03 +0000 (05:28 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
debian/changelog
tests/lib
tests/lib-restricts
tests/tests/build-modes-sbuild
tests/tests/quilt-gbp-build-modes-sbuild
tests/tests/sbuild-gitish

index f0b6919..d4ce818 100644 (file)
@@ -14,6 +14,8 @@ dgit (6.0~) unstable; urgency=medium
   * dgit: Always build the source package ourselves, rather than
     sometimes leaving that to the builder command.  dgit will now
     usually generate *_multi.changes rather than *_$arch.changes.
+  * test suite: Honour DGIT_SCHROOT_CHROOT to set the schroot to
+    use for the sbuild tests.
 
  --
 
index 2771252..a297227 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -74,6 +74,9 @@ incoming              = $tmp/incoming
 run_dinstall           = 0
 END
 
+schroot=${DGIT_SCHROOT_CHROOT:-build}
+# Pretty much any Debian sid snapshot schroot will do.
+
 : ${t_archive_method:=aq}
 : ${tagpfx:=archive/test-dummy}
 : ${suitespecs:=sid:unstable}
index bb695c4..dfaaa25 100644 (file)
@@ -13,6 +13,8 @@ t-restriction-x-dgit-git-only () {
 }
 
 t-restriction-x-dgit-schroot-build () {
+       # if DGIT_SCHROOT_CHROOT is set, user wants not to skip this test
+       if [ "x${DGIT_SCHROOT_CHROOT}" != x ]; then return 0; fi
        schroot -l -c build 2>&1 >/dev/null || return 1
 }
 
index 19dcc8a..cda0783 100755 (executable)
@@ -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"
index 4c86bfe..ec1d1c7 100755 (executable)
@@ -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
index 6e497b2..da90b6f 100755 (executable)
@@ -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; }
        '