Commit Diff

Commit:
94d2813841a649d5254974dd921aed01af1b24d4
From:
Nikolay Shirokovskiy <nshirokovskiy@tarantool.org>
Via:
Vladimir Davydov <vdavydov.dev@gmail.com>
Date:
Message:
build/lua: add TEST_BUILD define/tarantool.build flag In the commit 22d507d5e968 ("iproto: don't hang on uncancellable iproto request") we used TEST_BUILD define which is absent, we only have a CMake build option with such name. Let's add a define too. While at it let's also show this flag in the `tarantool.build` table. Follow-up #8423 @TarantoolBot document Title: new tarantool.build.test_build flag It is `true` if `TEST_BUILD` build option is set and `false` otherwise.
Actions:
Patch | Tree
commit - a12998a52a7387936d96cdbe3d5a0e7266047487
commit + 94d2813841a649d5254974dd921aed01af1b24d4
blob - 1b357f38c6670e58f5532052d9dfa1885bb353f0
blob + a1c71dcee463e0d5356d21ddbc789c97ee5a7af3
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -818,7 +818,7 @@ elseif(IS_DIRECTORY .git AND GIT)
     )
 endif()
 
-option(TEST_BUILD "Abort if memory leak is found." OFF)
+option(TEST_BUILD "Use defaults suited for tests" OFF)
 set(ABORT_ON_LEAK_DEFAULT ${TEST_BUILD})
 option(ABORT_ON_LEAK "Abort if memory leak is found." ${ABORT_ON_LEAK_DEFAULT})
 
blob - /dev/null
blob + 7b42446108feb9486e108ba16581679260dbd29a (mode 644)
--- /dev/null
+++ changelogs/unreleased/add-test-build-flag-to-tarantool-build.md
@@ -0,0 +1,4 @@
+## feature/box
+
+* Added a new flag `tarantool.build.test_build` that shows whether a build
+  flag `TEST_BUILD` is set.
blob - 8854c95c986feb6de54da02055a6ce3aa4de14be
blob + caa498e9b095bcdc993c0c0c24c9195929906068
--- src/lua/init.c
+++ src/lua/init.c
@@ -658,6 +658,15 @@ luaopen_tarantool(lua_State *L)
 #endif
 	lua_settable(L, -3);
 
+	/* build.test_build */
+	lua_pushstring(L, "test_build");
+#ifdef TEST_BUILD
+	lua_pushboolean(L, true);
+#else
+	lua_pushboolean(L, false);
+#endif
+	lua_settable(L, -3);
+
 	lua_settable(L, -3);    /* box.info.build */
 
 	/* debug */
blob - 3b829ed4a97653a3b149374a6ecfe87628a795a1
blob + b717eaf0a1ef77aa25b63f556f4438747b6aaef6
--- src/trivia/config.h.cmake
+++ src/trivia/config.h.cmake
@@ -299,6 +299,7 @@
 #cmakedefine BUILD_STATIC 1
 #cmakedefine EMBED_LUAZLIB 1
 #cmakedefine EMBED_LUAZIP 1
+#cmakedefine TEST_BUILD 1
 
 /*
  * vim: syntax=c
blob - 9a6b3d1c2fb87d407c0a9045b1e7d3ab837ab0aa
blob + eaf575d88d66d230b1149d824c4c479ab70ddbaf
--- test/app-luatest/tarantool_package_test.lua
+++ test/app-luatest/tarantool_package_test.lua
@@ -8,3 +8,8 @@ g.test_build_asan = function()
     local asan = b.flags:match('-fsanitize=[%a,]*address') ~= nil
     t.assert_equals(b.asan, asan)
 end
+
+g.test_build_test_build = function()
+    local b = tarantool.build
+    t.assert_equals(type(b.test_build), 'boolean')
+end