From: Timur Safin <tsafin@tarantool.org> To: imun@tarantool.org, alexander.turenko@tarantool.org Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] (no subject) Date: Thu, 15 Oct 2020 19:19:30 +0300 [thread overview] Message-ID: <11457da6c5f5f29b511a809cbc0908b19458d284.1602778378.git.tsafin@tarantool.org> (raw) Subject: [PATCH] luajit - avoid hardcode of paths to luajit test We try to avoid hardcode of paths to LuaJIT tests, which live in the 3rd party repository and might get updated without our notice. - to simplify cmake code we introduce symlink inside of `test` directory which is now pointing to `third_party/luajit/test` subdirectory - and we use `file(GLOB...)` statement now to propagate list of all available test directories we found inside of luajit submodule. Closes #5425 --- test/CMakeLists.txt | 14 +++++++++++--- test/luajit | 1 + 2 files changed, 12 insertions(+), 3 deletions(-) create mode 120000 test/luajit diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 7b28e2bd4..8e36cba6c 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -20,6 +20,16 @@ function(build_lualib lib sources) endif(TARGET_OS_DARWIN) endfunction() +macro(add_subdirectories base_directory) + file(GLOB entries RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${base_directory}/*") + foreach(entry ${entries}) + if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${entry}) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/${entry} + ${PROJECT_BINARY_DIR}/${entry}) + endif() + endforeach() +endmacro() + add_compile_flags("C;CXX" "-Wno-unused-parameter") @@ -75,9 +85,7 @@ add_subdirectory(app-tap) add_subdirectory(box) add_subdirectory(box-tap) add_subdirectory(unit) -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) -add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/luajit/test/misclib-getmetrics-capi ${PROJECT_BINARY_DIR}/third_party/luajit/test/misclib-getmetrics-capi) +add_subdirectories(luajit) # Move tarantoolctl config if (NOT ${PROJECT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR}) diff --git a/test/luajit b/test/luajit new file mode 120000 index 000000000..c83b4ed65 --- /dev/null +++ b/test/luajit @@ -0,0 +1 @@ +../third_party/luajit/test \ No newline at end of file -- 2.20.1
next reply other threads:[~2020-10-15 16:19 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-15 16:19 Timur Safin [this message] 2020-10-15 16:26 ` Timur Safin 2020-10-15 20:41 ` [Tarantool-patches] [PATCH] luajit - avoid hardcode of paths to luajit test Igor Munkin 2021-08-06 1:56 [Tarantool-patches] (no subject) Yan Shtunder via Tarantool-patches 2021-08-09 7:09 ` Serge Petrenko via Tarantool-patches
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=11457da6c5f5f29b511a809cbc0908b19458d284.1602778378.git.tsafin@tarantool.org \ --to=tsafin@tarantool.org \ --cc=alexander.turenko@tarantool.org \ --cc=imun@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] (no subject)' \ /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