diff options
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 21 |
2 files changed, 22 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 99f4cbb..69bf0b4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,6 +34,7 @@ valgrind: script: - valgrind build/tools/hscript-validate/hscript-validate tests/fixtures/0001-basic.installfile - valgrind build/tools/hscript-simulate/hscript-simulate tests/fixtures/0001-basic.installfile + - exit 0 pages: stage: deploy diff --git a/CMakeLists.txt b/CMakeLists.txt index 31fffe1..e3a8619 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,6 +12,7 @@ find_library(BCNM_LIBRARY REQUIRED wpactrl PATH_SUFFIXES bcnm) option(BUILD_TOOLS "Enable building of tools (Validator, Simulator, etc)" ON) option(COVERAGE "Build for code coverage tests (slow)" OFF) +option(VALGRIND "Run Valgrind during test phase" OFF) IF(COVERAGE) SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} --coverage") @@ -24,3 +25,23 @@ add_subdirectory(hscript) IF(BUILD_TOOLS) add_subdirectory(tools) ENDIF(BUILD_TOOLS) + +enable_testing() +IF(BUILD_TOOLS) + add_test(NAME "RSpecValidator" + COMMAND rspec spec/validator.rb + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests) + set_property(TEST "RSpecValidator" + PROPERTY ENVIRONMENT "PATH=$PATH:${CMAKE_CURRENT_BINARY_DIR}/tools/hscript-validate") + add_test(NAME "RSpecSimulator" + COMMAND rspec spec/simulator.rb + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests) + set_property(TEST "RSpecSimulator" + PROPERTY ENVIRONMENT "PATH=$PATH:${CMAKE_CURRENT_BINARY_DIR}/tools/hscript-simulate") + IF(VALGRIND) + add_test(NAME "ValgrindValidator" + COMMAND valgrind ${CMAKE_CURRENT_BINARY_DIR}/tools/hscript-validate/hscript-validate tests/fixtures/0001-basic.installfile) + add_test(NAME "ValgrindSimulator" + COMMAND valgrind ${CMAKE_CURRENT_BINARY_DIR}/tools/hscript-simulate/hscript-simulate tests/fixtures/0001-basic.installfile) + ENDIF(VALGRIND) +ENDIF(BUILD_TOOLS) |