From: Sergey Bronnikov via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: tarantool-patches@dev.tarantool.org,
Sergey Kaplun <skaplun@tarantool.org>,
Maxim Kokryashkin <m.kokryashkin@tarantool.org>
Subject: [Tarantool-patches] [PATCH luajit 2/3][v4] test: update CMake macro LibRealPath
Date: Thu, 21 Mar 2024 17:02:00 +0300 [thread overview]
Message-ID: <6179514206d7197de2097bed75aa46862cb4e651.1711029149.git.sergeyb@tarantool.org> (raw)
In-Reply-To: <cover.1711029149.git.sergeyb@tarantool.org>
From: Sergey Bronnikov <sergeyb@tarantool.org>
The patch updates CMake macro LibRealPath:
- Replace CMAKE_CXX_COMPILER with CMAKE_C_COMPILER,
because LuaJIT doesn't require CXX compiler and thus
it can be unavailable on a build system.
- Add a check for a code returned by a command with compiler.
- Add a check for a value returned by compiler, the value equal to
passed one means that library was not found in a system.
---
test/LuaJIT-tests/CMakeLists.txt | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/test/LuaJIT-tests/CMakeLists.txt b/test/LuaJIT-tests/CMakeLists.txt
index a0fb5440..f744abfe 100644
--- a/test/LuaJIT-tests/CMakeLists.txt
+++ b/test/LuaJIT-tests/CMakeLists.txt
@@ -33,12 +33,27 @@ if(LUAJIT_USE_ASAN)
# https://github.com/google/sanitizers/issues/934.
macro(LibRealPath output lib)
execute_process(
- COMMAND ${CMAKE_CXX_COMPILER} -print-file-name=${lib}
+ # CMAKE_C_COMPILER is used because it has the same behaviour
+ # as CMAKE_CXX_COMPILER, but CMAKE_CXX_COMPILER is not required
+ # for building LuaJIT and can be missed in GH Actions.
+ COMMAND ${CMAKE_C_COMPILER} -print-file-name=${lib}
OUTPUT_VARIABLE LIB_LINK
OUTPUT_STRIP_TRAILING_WHITESPACE
+ RESULT_VARIABLE RES
)
+ # GCC and Clang returns a passed filename,
+ # when library was not found.
+ if (${LIB_LINK} STREQUAL ${lib})
+ message(FATAL_ERROR "Library '${lib}' is not found")
+ endif()
+ if (NOT RES EQUAL 0)
+ message(FATAL_ERROR "Executing '${CMAKE_C_COMPILER} \
+ -print-file-name=${lib}' has failed")
+ endif()
+
# Fortunately, we are not interested in macOS here, so we can
- # use realpath.
+ # use realpath. Beware, builtin commands always returns
+ # an exit code equal to 0, we cannot check is it failed or not.
execute_process(
COMMAND realpath ${LIB_LINK}
OUTPUT_VARIABLE ${output}
--
2.34.1
next prev parent reply other threads:[~2024-03-21 14:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-21 14:01 [Tarantool-patches] [PATCH luajit 0/3][v4] cmake: replace prove with CTest Sergey Bronnikov via Tarantool-patches
2024-03-21 14:01 ` [Tarantool-patches] [PATCH luajit 1/3][v4] ci: execute LuaJIT tests with GCC 10 and ASAN Sergey Bronnikov via Tarantool-patches
2024-03-21 14:02 ` Sergey Bronnikov via Tarantool-patches [this message]
2024-03-21 15:00 ` [Tarantool-patches] [PATCH luajit 2/3][v4] test: update CMake macro LibRealPath Sergey Kaplun via Tarantool-patches
2024-03-22 12:34 ` Sergey Bronnikov via Tarantool-patches
2024-03-21 14:02 ` [Tarantool-patches] [PATCH luajit 3/3][v4] cmake: replace prove with CTest Sergey Bronnikov 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=6179514206d7197de2097bed75aa46862cb4e651.1711029149.git.sergeyb@tarantool.org \
--to=tarantool-patches@dev.tarantool.org \
--cc=estetus@gmail.com \
--cc=m.kokryashkin@tarantool.org \
--cc=skaplun@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH luajit 2/3][v4] test: update CMake macro LibRealPath' \
/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