From 2a987716a85c5cd05f270945c70aeac256a8e7e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Thu, 8 Feb 2018 09:51:24 +0200 Subject: [PATCH] Build tests by default The tests are now built by default. This should make it easier for users to verify that they have a working MaxScale. Also made the building of test_parse_kill conditional like the rest of the tests. --- cmake/defaults.cmake | 2 +- server/modules/protocol/MySQL/CMakeLists.txt | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake/defaults.cmake b/cmake/defaults.cmake index 6002be775..2c21c4b6e 100644 --- a/cmake/defaults.cmake +++ b/cmake/defaults.cmake @@ -40,7 +40,7 @@ set(GCOV FALSE CACHE BOOL "Use gcov build flags") set(WITH_SCRIPTS TRUE CACHE BOOL "Install init.d scripts and ldconf configuration files") # Build tests -set(BUILD_TESTS FALSE CACHE BOOL "Build tests") +set(BUILD_TESTS TRUE CACHE BOOL "Build tests") # Build packages set(PACKAGE FALSE CACHE BOOL "Enable package building (this disables local installation of system files)") diff --git a/server/modules/protocol/MySQL/CMakeLists.txt b/server/modules/protocol/MySQL/CMakeLists.txt index 31730dc9b..a9ceabada 100644 --- a/server/modules/protocol/MySQL/CMakeLists.txt +++ b/server/modules/protocol/MySQL/CMakeLists.txt @@ -5,4 +5,7 @@ install_module(mysqlcommon core) add_subdirectory(mariadbbackend) add_subdirectory(mariadbclient) -add_subdirectory(test) + +if (BUILD_TESTS) + add_subdirectory(test) +endif()