[Tarantool-patches] [PATCH luajit 3/6] test: move LibRealPath to the separate module

Sergey Bronnikov estetus at gmail.com
Tue Mar 26 11:33:29 MSK 2024


From: Sergey Kaplun <skaplun at tarantool.org>

This patch moves the `LibRealPath` macro to a separate module to be used
in other test suites.

Needed for tarantool/tarantool#9656
---
 test/CMakeLists.txt              |  1 +
 test/LuaJIT-tests/CMakeLists.txt | 37 ----------------------------
 test/cmake/LibRealPath.cmake     | 41 ++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 37 deletions(-)
 create mode 100644 test/cmake/LibRealPath.cmake

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 3ad5d15f..62478441 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -76,6 +76,7 @@ separate_arguments(LUAJIT_TEST_COMMAND)
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 include(AddTestLib)
+include(LibRealPath)
 
 add_subdirectory(LuaJIT-tests)
 add_subdirectory(PUC-Rio-Lua-5.1-tests)
diff --git a/test/LuaJIT-tests/CMakeLists.txt b/test/LuaJIT-tests/CMakeLists.txt
index badec91d..e8361e97 100644
--- a/test/LuaJIT-tests/CMakeLists.txt
+++ b/test/LuaJIT-tests/CMakeLists.txt
@@ -31,43 +31,6 @@ if(LUAJIT_USE_ASAN)
   # "((__interception::real___cxa_throw)) != (0)" (0x0, 0x0)
   # This is a workaround suggested at
   # https://github.com/google/sanitizers/issues/934.
-  macro(LibRealPath output lib)
-    execute_process(
-      # 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
-    )
-
-    if(NOT RES EQUAL 0)
-      message(FATAL_ERROR
-        "Executing '${CMAKE_C_COMPILER} -print-file-name=${lib}' has failed"
-      )
-    endif()
-
-    # GCC and Clang return a passed filename when a library is
-    # not found.
-    if(LIB_LINK STREQUAL ${lib})
-      message(FATAL_ERROR "Library '${lib}' is not found")
-    endif()
-
-    # Fortunately, we are not interested in macOS here, so we can
-    # use realpath. Beware, `realpath` always returns an exit code
-    # equal to 0, so we cannot check if it fails.
-    execute_process(
-      COMMAND realpath ${LIB_LINK}
-      OUTPUT_VARIABLE ${output}
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-
-    unset(LIB_LINK)
-    unset(RES)
-  endmacro()
-
   LibRealPath(LIB_STDCPP libstdc++.so)
   # XXX: GCC requires both. Clang requires only libstdc++.
   if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
diff --git a/test/cmake/LibRealPath.cmake b/test/cmake/LibRealPath.cmake
new file mode 100644
index 00000000..70d43c50
--- /dev/null
+++ b/test/cmake/LibRealPath.cmake
@@ -0,0 +1,41 @@
+# Find a full path of a library used by a compiler and set it to
+# the given variable.
+macro(LibRealPath output lib)
+  if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    message(FATAL_ERROR "LibRealPath macro is unsupported for OSX")
+  endif()
+  execute_process(
+    # 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
+  )
+
+  if(NOT RES EQUAL 0)
+    message(FATAL_ERROR
+      "Executing '${CMAKE_C_COMPILER} -print-file-name=${lib}' has failed"
+    )
+  endif()
+
+  # GCC and Clang return a passed filename when a library is
+  # not found.
+  if(LIB_LINK STREQUAL ${lib})
+    message(FATAL_ERROR "Library '${lib}' is not found")
+  endif()
+
+  # Fortunately, we are not interested in macOS here, so we can
+  # use realpath. Beware, `realpath` always returns an exit code
+  # equal to 0, so we cannot check if it fails.
+  execute_process(
+    COMMAND realpath ${LIB_LINK}
+    OUTPUT_VARIABLE ${output}
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+
+  unset(LIB_LINK)
+  unset(RES)
+endmacro()
-- 
2.34.1



More information about the Tarantool-patches mailing list