diff --git a/CMakeLists.txt b/CMakeLists.txt index 8fad5d9e50a081d3b68f9d36038894d014e26c95..bc1c9fe3534206c950cd5d613e8bac987cd9a033 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -712,7 +712,11 @@ endif() # tarantool info summary (used in server version output) # set(TARANTOOL_OPTIONS "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}") -set(TARANTOOL_OPTIONS "${TARANTOOL_OPTIONS} -DENABLE_BACKTRACE=${ENABLE_BACKTRACE}") +if(ENABLE_BACKTRACE) + set(TARANTOOL_OPTIONS "${TARANTOOL_OPTIONS} -DENABLE_BACKTRACE=TRUE") +else() + set(TARANTOOL_OPTIONS "${TARANTOOL_OPTIONS} -DENABLE_BACKTRACE=FALSE") +endif() set(TARANTOOL_BUILD "${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_BUILD_TYPE}") set(TARANTOOL_C_COMPILER ${CMAKE_C_COMPILER}) set(TARANTOOL_CXX_COMPILER ${CMAKE_CXX_COMPILER}) diff --git a/test/app-luatest/fiber_parent_backtrace_test.lua b/test/app-luatest/fiber_parent_backtrace_test.lua index c77a7dfbd7e00d73f075923a999fc9ea74574742..fa2175ef9f75e59933ad3facf43d8d9d527e0611 100644 --- a/test/app-luatest/fiber_parent_backtrace_test.lua +++ b/test/app-luatest/fiber_parent_backtrace_test.lua @@ -12,8 +12,7 @@ g.before_all = function() local _, _, enable_bt = string.find(tarantool.build.options, "-DENABLE_BACKTRACE=(%a+)") - local bt_enabled = enable_bt == "ON" or enable_bt == "TRUE" - t.skip_if(not bt_enabled, "requires backtrace feature") + t.skip_if(enable_bt == "FALSE", "requires backtrace feature") end) end