Browse Source

tests: Add a switch for disabling GUI tests

NoWheyCreamery.com doesn't run an Xserver, so we can't run UI tests.
Add a switch to disable these so test results can be reported
accurately.

Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
keep-around/2e38b3551ea0a6d69262f35cf916651fb1c101db
Anna 5 years ago
parent
commit
2e38b3551e
3 changed files with 7 additions and 3 deletions
  1. +2
    -2
      .gitlab-ci.yml
  2. +1
    -0
      CMakeLists.txt
  3. +4
    -1
      tests/CMakeLists.txt

+ 2
- 2
.gitlab-ci.yml View File

@ -6,9 +6,9 @@ stages:
build:
stage: build
script:
- cmake . && make
- cmake -DCONFIG_DEBUG=ON && make
test:
stage: test
script:
- cmake . && make tests
- cmake -DCONFIG_TESTING_VERBOSE=ON -DCONFIG_TESTING_GUI=OFF && make tests

+ 1
- 0
CMakeLists.txt View File

@ -4,6 +4,7 @@ project(Ocarina)
# Various options for users
option(CONFIG_DEBUG "Compile with debugging symbols" OFF)
option(CONFIG_TESTING_VERBOSE "Enable verbose output when running tests" OFF)
option(CONFIG_TESTING_GUI "Enable running GUI tests (requires an X server)" ON)
option(CONFIG_TESTING_ALBUM_ARTWORK "Enable album art fetching tests" ON)
# Configure settings


+ 4
- 1
tests/CMakeLists.txt View File

@ -14,4 +14,7 @@ add_library(guilib OBJECT EXCLUDE_FROM_ALL ${gui} ${core})
add_subdirectory(Music/)
add_subdirectory(core/)
add_subdirectory(gui/)
if (CONFIG_TESTING_GUI)
add_subdirectory(gui/)
endif()

Loading…
Cancel
Save