[med-svn] [camitk] 03/04: Start Xvfb server first + update test dependencies

[Emmanuel Promayon]

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

promayon-guest pushed a commit to branch master
in repository camitk.

commit eb24d34811f9c4f5411fcec8a0ee9fa2b248db62
Author: Emmanuel Promayon <Emmanuel.Promayon at univ-grenoble-alpes.fr>
Date:   Fri Jan 20 18:31:11 2017 +0100

    Start Xvfb server first + update test dependencies
---
 debian/tests/config  | 28 +++++++++++++++-------------
 debian/tests/control |  9 +++++++--
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/debian/tests/config b/debian/tests/config
index 238f347..25934df 100644
--- a/debian/tests/config
+++ b/debian/tests/config
@@ -17,12 +17,15 @@
 # The value return by this script corresponds to the config test that failed
 # (see log for config test id)
 # 
+
 set -e
 
 # cleanup on exit
 cleanup() {
     # backup the current exit status
     currentExitValue=$?
+    # kill the xfvb
+    kill $xvfbPid
     # cleanup current dir
     rm -rf $workingDir
     # use the backup value (otherwise the result of the "rm -rf" command above will
@@ -45,19 +48,18 @@ echo "===== Creating temporary directory ====="
 workingDir=$(mktemp --tmpdir -d camitk-test-tmp.XXXXXXXXXX)
 cd $workingDir
 
+echo "===== Configuring xvfb ====="
+# Starts the server first (to avoid a distracting warning output due to OpenGL context)
+Xvfb :5 -screen 0 1600x1200x24 -ac +extension GLX +render -noreset -v  -fbdir $workingDir/ &
+xvfbPid=$!
+echo "PID of Xvfb: $xvfbPid"
+export DISPLAY=:5
+export XAUTHORITY=/dev/null
+
 echo "===== Get CamiTK configuration ====="
-# debian-ci, gives a warning, this warning polutes the output,
-# which in turns gives the wrong expected version
-# This should get only the proper output
-xvfb-run --auto-servernum --server-num=1 --error-file ./xvfb-error camitk-config --config > ./config-output 2> ./config-error
+camitk-config --config > ./config-output 2>&1
 camitkConfig=$(cat config-output)
 
-echo "===== xvfb-error ====="
-cat ./xvfb-error
-
-echo "===== config-error ====="
-cat ./config-error
-
 echo "===== config-output ====="
 cat ./config-output
 
@@ -135,7 +137,7 @@ checkInstalledVersion() {
       echo "jessie"
       ;;
     *)
-      echo "unknown version: [$1]"
+      echo "unknown version"
       ;;
   esac
 }
@@ -189,9 +191,9 @@ checkValue() {
 # --------------------------------------------------------------------------
 
 installedVersion=$(getInstalledVersion)
-echo "===== 1- Detected installed CamiTK version is $installedVersion ====="
+echo "===== 1- Detected installed CamiTK version is: [$installedVersion] ====="
 version=$(checkInstalledVersion $installedVersion)
-if [ "$version" = "unknown" ]; then
+if [ "$version" = "unknown version" ]; then
   echo -n "Error: unexpected version "
   exitStatus=1
 else
diff --git a/debian/tests/control b/debian/tests/control
index 3cdc5d7..64e9e11 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,2 +1,7 @@
-Tests: config wizard
-Depends: libcamitk-dev
\ No newline at end of file
+# see https://people.debian.org/~mpitt/autopkgtest/README.package-tests.html for the syntax
+Tests: config, wizard
+# libgl1-mesa-dri and dbus are needed just to avoid warnings that confuse the config test
+# g++ is needed to compile the C++ code generated by cepgenerator in the wizard test
+Depends: libcamitk-dev, g++, dbus, libgl1-mesa-dri
+# this restriction is needed to avoid test abortion due to output to stderr
+Restrictions: allow-stderr
\ No newline at end of file

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