From 8f73207d019c6d14b57090aa204ca959dd5b7fd9 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Wed, 25 Nov 2015 15:24:04 +0100 Subject: [PATCH] Add CMake flag for disabling the unit tests fixes #10660 --- CMakeLists.txt | 6 +++++- INSTALL.md | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ae16c3ecc..38330d61c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,6 +38,7 @@ option(ICINGA2_WITH_LIVESTATUS "Build the Livestatus module" ON) option(ICINGA2_WITH_NOTIFICATION "Build the notification module" ON) option(ICINGA2_WITH_PERFDATA "Build the perfdata module" ON) option(ICINGA2_WITH_STUDIO "Build the Icinga Studio application" OFF) +option(ICINGA2_WITH_TESTS "Run unit tests" ON) file(STRINGS icinga2.spec VERSION_LINE REGEX "^Version: ") string(REPLACE "Version: " "" ICINGA2_VERSION ${VERSION_LINE}) @@ -258,7 +259,6 @@ add_subdirectory(icinga-app) add_subdirectory(etc) add_subdirectory(itl) add_subdirectory(doc) -add_subdirectory(test) add_subdirectory(agent) add_subdirectory(plugins) @@ -266,6 +266,10 @@ if(ICINGA2_WITH_STUDIO) add_subdirectory(icinga-studio) endif() +if(ICINGA2_WITH_TESTS) + add_subdirectory(test) +endif() + set(CPACK_PACKAGE_NAME "Icinga2") set(CPACK_PACKAGE_VENDOR "Icinga Development Team") set(CPACK_PACKAGE_VERSION ${ICINGA2_VERSION}) diff --git a/INSTALL.md b/INSTALL.md index 116b703d3..5cc006533 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -107,6 +107,8 @@ Defaults to `OFF`. - `ICINGA2_WITH_LIVESTATUS`: Determines whether the Livestatus module is built; defaults to `ON` - `ICINGA2_WITH_NOTIFICATION`: Determines whether the notification module is built; defaults to `ON` - `ICINGA2_WITH_PERFDATA`: Determines whether the perfdata module is built; defaults to `ON` +- `ICINGA2_WITH_STUDIO`: Determines whether the Icinga Studio application is built; defaults to `OFF` +- `ICINGA2_WITH_TESTS`: Determines whether the unit tests are built; defaults to `ON` CMake determines the Icinga 2 version number using `git describe` if the source directory is contained in a Git repository. Otherwise the version number