[pkg-perl-tools] 01/03: examples/check-build: update autopkgtest section.

gregor herrmann gregoa at debian.org
Fri Aug 18 15:48:46 UTC 2017


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

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

commit 87051f963f8fee8b5b8f5f6091b413787c5d2a91
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Aug 18 17:46:51 2017 +0200

    examples/check-build: update autopkgtest section.
    
    Drop adt-run variant, as stable has autopkgtest, and add --shell-fail
    option.
---
 examples/check-build | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/examples/check-build b/examples/check-build
index fee9d53..3049d1e 100755
--- a/examples/check-build
+++ b/examples/check-build
@@ -96,13 +96,8 @@ if grep -q 'Testsuite: autopkgtest' debian/control; then
 			AUTOPKGTEST_VIRT_SERVER_ARGS=/var/lib/libvirt/images/adt.img
 		fi
 		if [ -n "$AUTOPKGTEST_VIRT_SERVER" ]; then
-			if command -v autopkgtest >/dev/null; then
-				autopkgtest $CHANGES --log-file="$AUTOPKGTESTLOG" -- \
-					$AUTOPKGTEST_VIRT_SERVER $AUTOPKGTEST_VIRT_SERVER_ARGS
-			else
-				adt-run --changes $CHANGES --log-file="$AUTOPKGTESTLOG" --- \
-					$AUTOPKGTEST_VIRT_SERVER $AUTOPKGTEST_VIRT_SERVER_ARGS
-			fi
+			autopkgtest $CHANGES --log-file="$AUTOPKGTESTLOG" --shell-fail -- \
+				$AUTOPKGTEST_VIRT_SERVER $AUTOPKGTEST_VIRT_SERVER_ARGS
 			SUCCESS=$?
 			case $SUCCESS in
 				0)
@@ -115,7 +110,7 @@ if grep -q 'Testsuite: autopkgtest' debian/control; then
 			esac
 			exec 0</dev/tty
 			if [ -x /usr/bin/notify-send -a -n "$DISPLAY" ] ; then
-				notify-send -u $URGENCY -t 5000 "adt-run finished" "$(dpkg-parsechangelog | egrep '^(Source|Version)')"
+				notify-send -u $URGENCY -t 5000 "autopkgtest finished" "$(dpkg-parsechangelog | egrep '^(Source|Version)')"
 			fi
 		else
 			echo "W: Could find no adt-run virtualization server."

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



More information about the Pkg-perl-cvs-commits mailing list