From 9aacc41a48c1c749c84a3c39201aed23f01e3082 Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Tue, 7 Feb 2017 11:57:02 +0100 Subject: [PATCH] travis: Run a xfvb for TestPreferences Signed-off-by: Anton Lundin Signed-off-by: Dirk Hohndel --- .travis.yml | 6 +++++- tests/CMakeLists.txt | 12 ------------ 2 files changed, 5 insertions(+), 13 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 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 8aa92ccb9..03f550ae0 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -33,15 +33,3 @@ add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} TestPreferences TestRenumber ) - -add_custom_target(check_travis COMMAND ${CMAKE_CTEST_COMMAND} - DEPENDS - TestUnitConversion - TestProfile - TestGpsCoords - TestParse - TestGitStorage - TestPlan - TestDiveSiteDuplication - TestRenumber -)