[Tarantool-patches] [PATCH luajit 3/8] test: fix tarantool suite for out of source build
Igor Munkin
imun at tarantool.org
Thu Aug 11 14:17:42 MSK 2022
jit/vmdef.lua is autogenerated file, so it's put to src/ directory
located in scope of the binary artefacts tree. Before the patch LUA_PATH
lacks this path, so tarantool-tests target fails due to jit/vmdef.lua
misseek. As a result of this change src/ directory in scope of the
binary tree is included to LUA_PATH as well as the one from the source
tree has been.
Signed-off-by: Igor Munkin <imun at tarantool.org>
---
test/tarantool-tests/CMakeLists.txt | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/test/tarantool-tests/CMakeLists.txt b/test/tarantool-tests/CMakeLists.txt
index 27866869..97c23670 100644
--- a/test/tarantool-tests/CMakeLists.txt
+++ b/test/tarantool-tests/CMakeLists.txt
@@ -70,14 +70,17 @@ add_subdirectory(misclib-sysprof-capi)
# The part of the memory profiler toolchain is located in tools
# directory, jit, profiler, and bytecode toolchains are located
-# in src/ directory and auxiliary tests-related modules are
-# located in the current directory (but tests are run in the
-# binary directory), so LUA_PATH need to be updated.
+# in src/ directory, jit/vmdef.lua is autogenerated file also
+# located in src/ directory, but in scope of the binary artefacts
+# tree and auxiliary tests-related modules are located in the
+# current directory (but tests are run in the binary directory),
+# so LUA_PATH need to be updated.
make_lua_path(LUA_PATH
PATHS
${CMAKE_CURRENT_SOURCE_DIR}/?.lua
${PROJECT_SOURCE_DIR}/tools/?.lua
${PROJECT_SOURCE_DIR}/src/?.lua
+ ${PROJECT_BINARY_DIR}/src/?.lua
)
# Update LUA_CPATH with the library paths collected within
# <BuildTestLib> macro.
--
2.34.0
More information about the Tarantool-patches
mailing list