[med-svn] [figtree] 01/01: Add xvfb to test Depends to fake xserver

[Andreas Tille]

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

tille pushed a commit to branch master
in repository figtree.

commit fa9be44741474f9ff984e62f5c52316d7de7efa9
Author: Andreas Tille <tille at debian.org>
Date:   Thu Nov 30 09:40:51 2017 +0100

    Add xvfb to test Depends to fake xserver
---
 debian/changelog           | 1 +
 debian/tests/control       | 2 +-
 debian/tests/run-unit-test | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e16c76d..86b8991 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ figtree (1.4.3+dfsg-3) UNRELEASED; urgency=medium
   [ Andreas Tille ]
   * Drop wrong paragraph about texinfo in manpage
   * Hack around problem, that figtree needs manual interaction to end
+  * Add xvfb to test Depends to fake xserver
 
  -- Katerina Kalou <aik.kalou at gmail.com>  Wed, 29 Nov 2017 22:56:03 +0200
 
diff --git a/debian/tests/control b/debian/tests/control
index 5e354aa..41a333e 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,5 @@
 Tests: run-unit-test
-Depends: @
+Depends: @, xvfb
 Restrictions: allow-stderr
 
 
diff --git a/debian/tests/run-unit-test b/debian/tests/run-unit-test
index 46a6377..06bd154 100644
--- a/debian/tests/run-unit-test
+++ b/debian/tests/run-unit-test
@@ -14,8 +14,8 @@ gunzip -r *
 
 # Problem: figtree creates graphical output and requires user interaction to end
 # Hack around: start figtree in background and kill all figtree processes started by the current user
-figtree HA_continuous_MCC.tre HA_discrete_MCC.tre &
-figtree -graphic PDF test.tree test.pdf &
-figtree -graphic GIF -width 320 -height 320 test.tree test.gif &
+xvfb-run --auto-servernum figtree HA_continuous_MCC.tre HA_discrete_MCC.tre &
+figtree -graphic PDF test.tree test.pdf
+figtree -graphic GIF -width 320 -height 320 test.tree test.gif
 sleep 10
 kill -9 `ps aux | grep -w "^${USER}.*figtree" | grep -v "0:0[0-9] grep " | grep -v "0:0[0-9] ps " | sed "s/^${USER}[[:space:]]\+\([0-9]\+\)[[:space:]]\+.*/\1/"`

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/figtree.git