Make the check rule use xvfb-run, drop check-no-x

I see no reason for anyone wanting to see popping windows during a `make check` run. Closes #12172.
qgis · Jun 6, 2017 · eddf23c · eddf23c
1 parent 80911c6
commit eddf23c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -318,16 +318,14 @@ ADD_DEFINITIONS(-DENABLE_TESTS)
 ENABLE_TESTING()
 # Adds some testing specific build targets e.g. make Experimental
 INCLUDE(Dart)
-# Define "make check" as alias for "make test" - thanks geos :-)
-add_custom_target(check COMMAND ctest --output-on-failure)
 # Additional test configuration options e.g. max upload size of test report
 CONFIGURE_FILE(
   "${CMAKE_SOURCE_DIR}/cmake_templates/CTestCustom.cmake.in"
   "${CMAKE_BINARY_DIR}/CTestCustom.cmake"
   IMMEDIATE @ONLY)
 # For server side testing we have no X, we can use xfvb as a fake x
 # sudo apt-get install xfvb
-add_custom_target(check-no-x COMMAND xvfb-run --server-args=-screen\ 10\ 1024x768x24 ctest --output-on-failure)
+add_custom_target(check COMMAND xvfb-run --server-args=-screen\ 10\ 1024x768x24 ctest --output-on-failure)
 ENDIF(ENABLE_TESTS)
 
 IF (WITH_CORE)

diff --git a/tests/README.md b/tests/README.md
@@ -9,6 +9,7 @@ Make sure that you have enabled building of tests in CMake.
 # Run tests
 
 You can run all tests using `make check`.
+Note you will need `xvfb-run` for that (sudo apt-get install xfvb).
 
 Individual tests can be run using `ctest`.