From 7ce59c9fbd5e99619a9ab0ac6177d21e6aca49c7 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Sat, 28 Oct 2017 21:14:02 +0200 Subject: Restore 'make tests' rule --- .travis.yml | 2 +- testing/CMakeLists.txt | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 09f5af9..acc325a 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 - - ctest -V + - make tests - make docs diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt index 84162ea..97b4868 100644 --- a/testing/CMakeLists.txt +++ b/testing/CMakeLists.txt @@ -1,3 +1,8 @@ +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