Skip to content

Commit

Permalink
Build tests even with skip_test config flag set to True. (#475)
Browse files Browse the repository at this point in the history
* Build tests even with skip_test config flag set to True.

* Update version,
  • Loading branch information
szmyd authored Jul 30, 2024
1 parent 3f3c0f3 commit 8ee9a2b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 0 additions & 2 deletions cmake/test_mode.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
cmake_minimum_required(VERSION 3.11)

if (${BUILD_TESTING})
if (DEFINED TEST_TARGET)
macro(can_build_io_tests ret)
set(${ret} false)
Expand Down Expand Up @@ -40,7 +39,6 @@ if (DEFINED TEST_TARGET)
set(${ret} true)
endif()
endmacro()
endif ()
else()
macro(can_build_io_tests ret)
set(${ret} false)
Expand Down
7 changes: 3 additions & 4 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class HomestoreConan(ConanFile):
name = "homestore"
version = "6.4.31"
version = "6.4.32"

homepage = "https://github.com/eBay/Homestore"
description = "HomeStore Storage Engine"
Expand Down Expand Up @@ -69,14 +69,13 @@ def layout(self):
def generate(self):
# This generates "conan_toolchain.cmake" in self.generators_folder
tc = CMakeToolchain(self)
if not self.conf.get("tools.build:skip_test", default=False):
tc.variables["BUILD_TESTING"] = "ON"
if self.options.testing != "off":
tc.variables["TEST_TARGET"] = self.options.testing
tc.variables["CONAN_CMAKE_SILENT_OUTPUT"] = "ON"
tc.variables['CMAKE_EXPORT_COMPILE_COMMANDS'] = 'ON'
tc.variables["CTEST_OUTPUT_ON_FAILURE"] = "ON"
tc.variables["MEMORY_SANITIZER_ON"] = "OFF"
tc.variables["BUILD_COVERAGE"] = "OFF"
tc.variables["TEST_TARGET"] = self.options.testing
if self.settings.build_type == "Debug":
if self.options.get_safe("coverage"):
tc.variables['BUILD_COVERAGE'] = 'ON'
Expand Down

0 comments on commit 8ee9a2b

Please sign in to comment.