From c1ea77dab138268bf19da71dbeca00cbe6371b70 Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Sat, 25 Jul 2015 17:24:14 +0200 Subject: [PATCH] Add integration tests to 'make check' Signed-off-by: Uli Schlachter --- CMakeLists.txt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 991c6a92a..07dc15bc5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -320,14 +320,23 @@ if(GENERATE_DOC) endif() # }}} -# {{{ Unit tests +# {{{ Tests find_program(BUSTED_EXECUTABLE busted) if(BUSTED_EXECUTABLE) - add_custom_target(check ALL + add_custom_target(check-unit ALL ${BUSTED_EXECUTABLE} "--lpath=${CMAKE_BINARY_DIR}/lib/?.lua;${CMAKE_BINARY_DIR}/lib/?/init.lua;spec/?.lua" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} VERBATIM) endif() +add_custom_target(check-integration + "${CMAKE_SOURCE_DIR}/tests/run.sh" + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + VERBATIM) +if(BUSTED_EXECUTABLE) + add_custom_target(check DEPENDS check-integration check-unit) +else() + add_custom_target(check DEPENDS check-integration) +endif() # }}} # vim: filetype=cmake:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80:foldmethod=marker