[pkg-perl-tools] 03/06: check-build: support running adt-run with the adt-virt-qemu virtualization server.

[Intrigeri]

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to branch master
in repository pkg-perl-tools.

commit 7fe10b5950597af46c65d8e6c2135e868f0e9d81
Author: intrigeri <intrigeri at boum.org>
Date:   Mon Aug 10 14:22:08 2015 +0000

    check-build: support running adt-run with the adt-virt-qemu virtualization server.
---
 examples/check-build | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/examples/check-build b/examples/check-build
index 72efc4b..e969ab0 100755
--- a/examples/check-build
+++ b/examples/check-build
@@ -83,11 +83,25 @@ if [ "$PIU" = "y" ]; then
 fi
 echo
 
-if grep -q 'Testsuite: autopkgtest' debian/control && [ -x /usr/bin/schroot ] && schroot -l | grep -q default ; then
+if grep -q 'Testsuite: autopkgtest' debian/control; then
 	read -n 1 -p "adt-run? y/N " ADT
 	if [ "$ADT" = "y" ]; then
 		ADTLOG="${CHANGES%.changes}_adt-run.log"
-		adt-run --changes $CHANGES --log-file="$ADTLOG" --- schroot default | tee "$ADTLOG"
+		if [ -x /usr/bin/schroot ] && schroot -l | grep -q default; then
+			ADT_VIRT_SERVER=schroot
+			ADT_VIRT_SERVER_ARGS=default
+		elif [ -x /usr/bin/adt-virt-qemu ] && \
+			[ -e /var/lib/libvirt/images/adt.img ]; then
+			ADT_VIRT_SERVER=adt-virt-qemu
+			ADT_VIRT_SERVER_ARGS=/var/lib/libvirt/images/adt.img
+		fi
+		if [ -n "$ADT_VIRT_SERVER" ]; then
+			adt-run --changes $CHANGES --log-file="$ADTLOG" --- \
+				$ADT_VIRT_SERVER $ADT_VIRT_SERVER_ARGS \
+				| tee "$ADTLOG"
+		else
+			echo "W: Could find no adt-run virtualization server."
+		fi
 		# TODO:
 		# since 3.7 we get colours but only without --log-file=. and on STDERR.
 		# See https://git-tails.immerda.ch/tails/tree/run_test_suite?h=testing

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/pkg-perl-tools.git