[PATCH v2 1/3] travis: Run a xfvb for TestPreferences

Anton Lundin glance at acc.umu.se
Tue Feb 7 02:57:02 PST 2017


Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
 .travis.yml          |  6 +++++-
 tests/CMakeLists.txt | 12 ------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2850b02..42c4f81 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 8aa92cc..03f550a 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
-)
-- 
2.9.3



More information about the subsurface mailing list