Commit 30b92e7a authored by Simon McVittie's avatar Simon McVittie

Improve autopkgtest support

  - use a shell wildcard instead of dpkg-architecture, to avoid stderr spam
    failing the test if gcc is missing
  - wrap each test-case in an arbitrary (5 minute) timeout so that one
    test-case failing won't halt the whole build
parent 6ca91919
dbus (1.8.0-3) unstable; urgency=medium
* Improve autopkgtest support
- use a shell wildcard instead of dpkg-architecture, to avoid stderr spam
failing the test if gcc is missing
- wrap each test-case in an arbitrary (5 minute) timeout so that one
test-case failing won't halt the whole build
-- Simon McVittie <smcv@debian.org> Wed, 26 Mar 2014 09:17:20 +0000
dbus (1.8.0-2) unstable; urgency=low
* debian/rules: look for DEB_BUILD_PROFILES, the new name for
......
Tests: installed-tests
Depends: dbus, libdbus-1-3, dbus-1-dbg, dpkg-dev
Depends: dbus, libdbus-1-3, dbus-1-dbg
Tests: build
Depends: libdbus-1-dev, dbus, build-essential
......@@ -3,17 +3,16 @@
set -e
multiarch="`dpkg-architecture -qDEB_HOST_MULTIARCH`"
timeout="timeout 300s"
ret=0
i=0
for dir in "/usr/lib/$multiarch/dbus-1.0/test" "/usr/lib/$multiarch/dbus-1.0/debug-build/lib/dbus-1.0/test"; do
for dir in /usr/lib/*/dbus-1.0/test /usr/lib/*/dbus-1.0/debug-build/lib/dbus-1.0/test; do
for t in "$dir"/test-*; do
i=$(( $i + 1 ))
echo "# $i - $t ..."
echo "x" > "$ADTTMP/result"
( set +e; $t; echo "$?" > "$ADTTMP/result" ) 2>&1 | sed 's/^/# /'
( set +e; $timeout $t; echo "$?" > "$ADTTMP/result" ) 2>&1 | sed 's/^/# /'
e="$(cat "$ADTTMP/result")"
case "$e" in
(0)
......@@ -30,4 +29,5 @@ for dir in "/usr/lib/$multiarch/dbus-1.0/test" "/usr/lib/$multiarch/dbus-1.0/deb
done
done
echo "1..$i"
exit $ret
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment