Skip to content
Permalink
Browse files

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.
  • Loading branch information
strk committed Jun 6, 2017
1 parent 80911c6 commit eddf23c3813ea4e8c7f902726a7124442fa72e47
Showing with 2 additions and 3 deletions.
  1. +1 −3 CMakeLists.txt
  2. +1 −0 tests/README.md
@@ -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)
@@ -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`.

0 comments on commit eddf23c

Please sign in to comment.
You can’t perform that action at this time.