diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0a32a421cc78d183da74034abf075ae696751639..f4229d7af7c1caccf723493c4eac1a774f89ad39 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -77,6 +77,7 @@ endif() # 3rd party lua sources lua_source(lua_sources ../third_party/luafun/fun.lua fun_lua) lua_source(lua_sources ../third_party/lua/luadebug.lua luadebug_lua) +lua_source(lua_sources ../third_party/checks/checks/version.lua checks_version_lua) lua_source(lua_sources ../third_party/checks/checks.lua checks_lua) lua_source(lua_sources ../third_party/metrics/metrics/api.lua metrics_api_lua) lua_source(lua_sources ../third_party/metrics/metrics/cartridge/failover.lua metrics_cartridge_failover_lua) diff --git a/src/box/lua/init.c b/src/box/lua/init.c index b08322b435b1311ccf81e9db28962fb181f3cbdb..df19ecdf69bd8f2e2c08a1fc39c526542a721568 100644 --- a/src/box/lua/init.c +++ b/src/box/lua/init.c @@ -132,6 +132,7 @@ extern char session_lua[], upgrade_lua[], console_lua[], merger_lua[], + checks_version_lua[], checks_lua[], metrics_api_lua[], metrics_cartridge_failover_lua[], @@ -235,7 +236,10 @@ static const char *lua_sources[] = { * and after box.tuple and box.error box modules. (Beware * that it won't fail to load if modules not found since * checks supports pure luajit and older tarantool versions). + * Module components order is important here. */ + "third_party/checks/checks/version", + "checks.version", checks_version_lua, "third_party/checks/checks", "checks", checks_lua, /* * Metrics uses checks. Module components order is also important here diff --git a/test/app-luatest/checks_test.lua b/test/app-luatest/checks_test.lua index e05c0054908fb5cf45151184b07a9123957fcdf5..c261d80f8e3d846e0ae308575ac897df4f6f9106 100644 --- a/test/app-luatest/checks_test.lua +++ b/test/app-luatest/checks_test.lua @@ -1,7 +1,4 @@ -local checks = require('checks') - -local package_source = debug.getinfo(checks).source -assert(package_source:match('^@builtin') ~= nil, - "Run tests for built-in checks package") +local rock_utils = require('third_party.checks.test.rock_utils') +rock_utils.assert_builtin('checks') require('third_party.checks.test.test') diff --git a/test/app-luatest/tnt_debug_getsources_test.lua b/test/app-luatest/tnt_debug_getsources_test.lua index 1dd472ac0f0b75eff2e8bd02a73315af5396727c..73c8a3d518aaa123cf75d98adaab9b608e0ccb30 100644 --- a/test/app-luatest/tnt_debug_getsources_test.lua +++ b/test/app-luatest/tnt_debug_getsources_test.lua @@ -23,6 +23,7 @@ local files = { 'box/net_box', 'box/console', 'box/merger', + 'third_party/checks/checks/version', 'third_party/checks/checks', 'third_party/metrics/metrics/api', 'third_party/metrics/metrics/cartridge/failover', diff --git a/third_party/checks b/third_party/checks index 4771f6bcd0caa7005313082b843bc38f75d59e70..be7cff198f19097cae4c3f767ef310081baa5b97 160000 --- a/third_party/checks +++ b/third_party/checks @@ -1 +1 @@ -Subproject commit 4771f6bcd0caa7005313082b843bc38f75d59e70 +Subproject commit be7cff198f19097cae4c3f767ef310081baa5b97