[Tarantool-patches] [PATCH v2 0/2] Enable LuaJIT tests written in C

Igor Munkin imun at tarantool.org
Mon Apr 20 14:26:53 MSK 2020


There is an masked error in test/CmakeLists.txt that doesn't arise for
in-source build bootstrap. However it occurs when out-of-source build
being bootstrapped. Here is a patch with the diff:

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

From: Igor Munkin <imun at tarantool.org>
Date: Mon, 20 Apr 2020 11:29:23 +0300
Subject: [PATCH] build: temporary fix for luajit-tap tests cmake

Fixes the regression from 335f80a04a2c3541cc1de8758758d9e1ea683cc6
('test: adjust luajit-tap testing machinery').

Signed-off-by: Igor Munkin <imun at tarantool.org>
---
 test/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0ae3843e3..37cc099b7 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -59,8 +59,8 @@ add_subdirectory(app)
 add_subdirectory(app-tap)
 add_subdirectory(box)
 add_subdirectory(unit)
-add_subdirectory(luajit-tap/gh-4427-ffi-sandwich)
-add_subdirectory(luajit-tap/lj-flush-on-trace)
+add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/luajit/test/gh-4427-ffi-sandwich ${PROJECT_BINARY_DIR}/third_party/luajit/test/gh-4427-ffi-sandwich)
+add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/luajit/test/lj-flush-on-trace ${PROJECT_BINARY_DIR}/third_party/luajit/test/lj-flush-on-trace)
 
 # Move tarantoolctl config
 if (NOT ${PROJECT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
-- 
2.25.0

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

The fix is applied to 1.10, 2.2, 2.3 and master branches by Kirill.

On 15.04.20, Igor Munkin wrote:
> This series prepares the existing testing machinery to run LuaJIT tests
> requiring libraries implemented in C and enables the existing ones:
> * gh-4427-ffi-sandwich
> * lj-flush-on-trace
> 
> Branch: https://github.com/tarantool/tarantool/tree/imun/ffi-sandwich
> 
> Changes in v2:
> * Reworked tests considering Vlad's comments.
> 
> Igor Munkin (2):
>   luajit: bump new version
>   test: adjust luajit-tap testing machinery
> 
>  test/CMakeLists.txt | 17 +++++++++++------
>  third_party/luajit  |  2 +-
>  2 files changed, 12 insertions(+), 7 deletions(-)
> 
> -- 
> 2.25.0
> 

-- 
Best regards,
IM


More information about the Tarantool-patches mailing list