Merge lp:~pitti/notify-osd/fix-autopkgtest into lp:notify-osd

[Martin Pitt]

Add missing "make" and "libnotify-bin" autopkgtest dependencies, and show test log on failure.

The autopkgtest currently fails [1] because the test runs "make", but doesn't
depend on it. Trivial and tested fix.

[1] https://jenkins.qa.ubuntu.com/job/utopic-adt-notify-osd/10/ARCH=i386,label=adt/console

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:484
http://jenkins.qa.ubuntu.com/job/notify-osd-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-utopic-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-utopic-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-utopic-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/notify-osd-ci/23/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

thanks

review: Approve

[Sebastien Bacher (seb128)]

thanks

review: Approve

[Martin Pitt (pitti)]

Locally tested again with both the failing case (for seeing the failed log) and succeeding case. (adt-run -B .// --- qemu adt-utopic-amd64-cloud.img)

=== modified file 'debian/tests/control'
--- debian/tests/control	2013-07-25 13:47:37 +0000
+++ debian/tests/control	2014-08-19 13:34:01 +0000
@@ -1,3 +1,3 @@
 Tests: upstream
-Depends: @, dbus-x11, gnome-screensaver, hicolor-icon-theme, xvfb, at-spi2-core
+Depends: @, make, dbus-x11, gnome-screensaver, hicolor-icon-theme, xvfb, at-spi2-core, libnotify-bin
 Restrictions: build-needed

=== modified file 'debian/tests/upstream'
--- debian/tests/upstream	2012-11-26 20:17:09 +0000
+++ debian/tests/upstream	2014-08-19 13:34:01 +0000
@@ -1,2 +1,5 @@
 #!/bin/sh
-xvfb-run --server-args="-screen 0 800x600x8" make check
+if ! xvfb-run --server-args="-screen 0 800x600x8" make check; then
+   cat tests/test-suite.log >&2
+   exit 1
+fi