summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorGravatar Anton Lundin <glance@acc.umu.se>2017-02-07 11:57:02 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-02-07 07:48:00 -0800
commit9aacc41a48c1c749c84a3c39201aed23f01e3082 (patch)
tree5ede0b34b26a9831d0d3e42aa5558746391c088c /.travis.yml
parentb912880707aa2b7e0784734f889aeb6dc99b877f (diff)
downloadsubsurface-9aacc41a48c1c749c84a3c39201aed23f01e3082.tar.gz
travis: Run a xfvb for TestPreferences
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 5 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 2850b02b4..42c4f811d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,10 @@ before_install:
chmod +x ./qt-opensource-linux-x64-android-5.8.0.run ;
./qt-opensource-linux-x64-android-5.8.0.run -platform minimal --script qt-installer-noninteractive.qs --no-force-installations ;
fi
+ # TestPreferences uses gui calls, so run a xvfb so it has something to talk to
+ - "export DISPLAY=:99.0"
+ - "sh -e /etc/init.d/xvfb start"
+
script:
- perl -pi -e 's/BUILDGRANTLEE=1/BUILDGRANTLEE=0/' scripts/build.sh
@@ -43,5 +47,5 @@ script:
- export CMAKE_PREFIX_PATH=$PWD/Qt/5.8/gcc_64/lib/cmake ;
cd .. ;
bash -e ./subsurface/scripts/build.sh
- - cd subsurface/build ; env CTEST_OUTPUT_ON_FAILURE=1 make check_travis
+ - cd subsurface/build ; env CTEST_OUTPUT_ON_FAILURE=1 make check
# - cd subsurface/build-mobile ; env CTEST_OUTPUT_ON_FAILURE=1 make check