diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-02-06 22:25:53 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-02-06 22:25:53 -0800 |
| commit | 5018ad47485112e5b524d948cfc8953c21f4f51a (patch) | |
| tree | eb5ccd7374544955c527460379f91bcf108bb0ae | |
| parent | 2bad9bd57d87452e5ce19df3bd331074f3c7d095 (diff) | |
| download | subsurface-5018ad47485112e5b524d948cfc8953c21f4f51a.tar.gz | |
On Travis, don't run TestPreferences
... because that one needs a display to run.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 1f17dd9bb..2850b02b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,5 +43,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 + - cd subsurface/build ; env CTEST_OUTPUT_ON_FAILURE=1 make check_travis # - cd subsurface/build-mobile ; env CTEST_OUTPUT_ON_FAILURE=1 make check diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 03f550ae0..8aa92ccb9 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -33,3 +33,15 @@ 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 +) |