From b54b843accb97105ae4afaf24136e33bfd1ea9d4 Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Fri, 20 Oct 2017 12:45:45 +0200 Subject: CMake: use add_test to create a test This checks the calling from "make tests" to "make test", but lets CMake handle all the rest. --- .travis.yml | 2 +- testing/CMakeLists.txt | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index acc325a..09f5af9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,5 +19,5 @@ script: - cd build - cmake -G "Unix Makefiles" -Dbuild_doc=ON -Dbuild_wizard=ON .. - make - - make tests + - ctest -V - make docs diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt index d9f35ff..84162ea 100644 --- a/testing/CMakeLists.txt +++ b/testing/CMakeLists.txt @@ -1,6 +1,4 @@ -add_custom_target(tests - COMMENT "Running doxygen tests..." - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --all --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing - DEPENDS doxygen +add_test(NAME suite + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --all --doxygen $ --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing ) -- cgit v0.12