From: Igor Munkin <imun@tarantool.org> To: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>, Sergey Ostanevich <sergos@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH v2 0/2] Enable LuaJIT tests written in C Date: Mon, 20 Apr 2020 14:26:53 +0300 [thread overview] Message-ID: <20200420112653.GX8314@tarantool.org> (raw) In-Reply-To: <cover.1586909073.git.imun@tarantool.org> 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@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@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
prev parent reply other threads:[~2020-04-20 11:34 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-15 0:36 Igor Munkin 2020-04-15 0:36 ` [Tarantool-patches] [PATCH v2 1/2] luajit: bump new version Igor Munkin 2020-04-15 0:36 ` [Tarantool-patches] [PATCH v2 2/2] test: adjust luajit-tap testing machinery Igor Munkin 2020-04-19 19:04 ` Sergey Ostanevich 2020-04-19 16:17 ` [Tarantool-patches] [PATCH v2 0/2] Enable LuaJIT tests written in C Vladislav Shpilevoy 2020-04-19 17:51 ` Igor Munkin 2020-04-19 19:04 ` Sergey Ostanevich 2020-04-19 20:14 ` Igor Munkin 2020-04-19 20:18 ` Igor Munkin 2020-04-20 7:10 ` Kirill Yukhin 2020-04-20 11:26 ` Igor Munkin [this message]
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200420112653.GX8314@tarantool.org \ --to=imun@tarantool.org \ --cc=sergos@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v2 0/2] Enable LuaJIT tests written in C' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox