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: [Tarantool-patches] [PATCH v2 2/2] test: adjust luajit-tap testing machinery Date: Wed, 15 Apr 2020 03:36:46 +0300 [thread overview] Message-ID: <7d48bf3ef1f0475b5b805d8548071a535270d63e.1586909073.git.imun@tarantool.org> (raw) In-Reply-To: <cover.1586909073.git.imun@tarantool.org> This changeset makes possible to run luajit-tap tests requiring libraries implemented in C: * symlink to luajit test is created on configuration phase instead of build one. * introduced a CMake function for building shared libraries required for luajit tests. Furthermore this commit enables CMake build for the following luajit-tap tests: * gh-4427-ffi-sandwich * lj-flush-on-trace Signed-off-by: Igor Munkin <imun@tarantool.org> --- test/CMakeLists.txt | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 9b5df7dc5..0ae3843e3 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -13,6 +13,13 @@ function(build_module module files) endif(TARGET_OS_DARWIN) endfunction() +function(build_lualib lib sources) + add_library(${lib} SHARED ${sources}) + set_target_properties(${lib} PROPERTIES PREFIX "") + if(TARGET_OS_DARWIN) + set_target_properties(${lib} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") + endif(TARGET_OS_DARWIN) +endfunction() add_compile_flags("C;CXX" "-Wno-unused-parameter") @@ -21,13 +28,9 @@ if(POLICY CMP0037) cmake_policy(SET CMP0037 OLD) endif(POLICY CMP0037) -add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/luajit-tap - COMMAND ${CMAKE_COMMAND} -E create_symlink +execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${PROJECT_SOURCE_DIR}/third_party/luajit/test - ${CMAKE_CURRENT_BINARY_DIR}/luajit-tap - COMMENT Create a symlink for luajit test dir to fix out-of-source tests) -add_custom_target(symlink_luajit_tests ALL - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/luajit-tap) + ${CMAKE_CURRENT_BINARY_DIR}/luajit-tap) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/small COMMAND ${CMAKE_COMMAND} -E create_symlink @@ -56,6 +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) # Move tarantoolctl config if (NOT ${PROJECT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR}) -- 2.25.0
next prev parent reply other threads:[~2020-04-15 0:43 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-15 0:36 [Tarantool-patches] [PATCH v2 0/2] Enable LuaJIT tests written in C Igor Munkin 2020-04-15 0:36 ` [Tarantool-patches] [PATCH v2 1/2] luajit: bump new version Igor Munkin 2020-04-15 0:36 ` Igor Munkin [this message] 2020-04-19 19:04 ` [Tarantool-patches] [PATCH v2 2/2] test: adjust luajit-tap testing machinery 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
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=7d48bf3ef1f0475b5b805d8548071a535270d63e.1586909073.git.imun@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 2/2] test: adjust luajit-tap testing machinery' \ /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