[Tarantool-patches] [PATCH luajit 1/3] test: split utils.lua into several modules

Igor Munkin imun at tarantool.org
Tue Jun 27 16:35:45 MSK 2023


A tiny fixup is coming...

On 27.06.23, Igor Munkin wrote:
> The next patch introduces a separate JIT-related module with convenient
> utils for JIT engine testing. Considering this change it looks vital to
> make a structured utils distributed module instead of "all in one" Lua
> chunk. As a result the original utils.lua is split into the several
> modules per subsystem to be tested (e.g. GC, frontend, profilers, etc.).
> 
> Lazy loading of the introduced submodules allows to use this utils in
> all test chunks regardless LuaJIT configuration (e.g. with JIT engine
> disabled, without FFI support, etc) and do not spoil utils table with
> the excess helpers.
> 
> Signed-off-by: Igor Munkin <imun at tarantool.org>
> ---

<snipped>

> 
> diff --git a/test/tarantool-tests/CMakeLists.txt b/test/tarantool-tests/CMakeLists.txt
> index 527905b6..14a98cf2 100644
> --- a/test/tarantool-tests/CMakeLists.txt
> +++ b/test/tarantool-tests/CMakeLists.txt
> @@ -75,7 +75,7 @@ add_subdirectory(lj-flush-on-trace)
>  # directory), so LUA_PATH need to be updated.
>  make_lua_path(LUA_PATH
>    PATHS
> -    ${CMAKE_CURRENT_SOURCE_DIR}/?.lua

Oops, this line was removed by mistake: in this case tap.lua can't be
found. Removed this line back:

================================================================================

diff --git a/test/tarantool-tests/CMakeLists.txt b/test/tarantool-tests/CMakeLists.txt
index 14a98cf2..b1211971 100644
--- a/test/tarantool-tests/CMakeLists.txt
+++ b/test/tarantool-tests/CMakeLists.txt
@@ -75,6 +75,7 @@ add_subdirectory(lj-flush-on-trace)
 # directory), so LUA_PATH need to be updated.
 make_lua_path(LUA_PATH
   PATHS
+    ${CMAKE_CURRENT_SOURCE_DIR}/?.lua
     ${CMAKE_CURRENT_SOURCE_DIR}/?/init.lua
     ${PROJECT_SOURCE_DIR}/tools/?.lua
     ${LUAJIT_SOURCE_DIR}/?.lua

================================================================================

> +    ${CMAKE_CURRENT_SOURCE_DIR}/?/init.lua
>      ${PROJECT_SOURCE_DIR}/tools/?.lua
>      ${LUAJIT_SOURCE_DIR}/?.lua
>      ${LUAJIT_BINARY_DIR}/?.lua

<snipped>

> -- 
> 2.30.2
> 

-- 
Best regards,
IM


More information about the Tarantool-patches mailing list