<!DOCTYPE html>
<html data-lt-installed="true">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body style="padding-bottom: 1px;">
<p>Thanks, LGTM.<br>
</p>
<div class="moz-cite-prefix">On 24.09.2024 14:28, Sergey Kaplun
wrote:<br>
</div>
<blockquote type="cite" cite="mid:ZvKiQHqLc7kqrpX4@root">
<pre class="moz-quote-pre" wrap="">Hi, Sergey!
Thanks for the review!
Fixed your comment and force-pushed the branch.
On 24.09.24, Sergey Bronnikov wrote:
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">Hi, Sergey,
thanks for the updated patch!
I'm happy to see how much code was removed.
See my comments below.
On 24.09.2024 13:29, Sergey Kaplun wrote:
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">This patch sets the unique value of each of these variables for each of
the tests and only where they are needed. Also, it drops the comment
about SIP [1] tricks since it is obsolete after
29897567ee5ed57e961c730432c056a3dbaa8f09 ("test: stop using
utils.selfrun in tests").
[1]:<a class="moz-txt-link-freetext" href="https://support.apple.com/en-us/HT204899">https://support.apple.com/en-us/HT204899</a>
Resolves tarantool/tarantool#9898
---
</pre>
</blockquote>
</blockquote>
<pre class="moz-quote-pre" wrap="">
<snipped>
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">+
+ if(LIBS_${test_name})
+ foreach(path ${LIBS_${test_name}})
+ # Add the directory where the library is built to the list
+ # with entries for the LUA_CPATH environment variable, so
+ # LuaJIT can find and load it.
+ AppendTestEnvVar(${test_title}
+ LUA_CPATH "${path}/?${CMAKE_SHARED_LIBRARY_SUFFIX}\;"
+ )
+ # Also, add this directory to the LD_LIBRARY_PATH environment
+ # variable so FFI machinery can find and load it.
+ # XXX: Be noticed that we shouldn't use `"` here to wrap the
+ # variable's content. If we do this, the variable value will
+ # contain `"` at the beginning and the end, so this `"` at the
+ # beginning will be treated as the directory for the entry.
+ # XXX: Since the auxiliary libraries are built as dynamically
+ # loaded modules on MacOS instead of shared libraries as it is
+ # done on Linux and BSD, another environment variable should
+ # be used to guide <ffi.load> while searching the extension.
+ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+ AppendTestEnvVar(${test_title} DYLD_LIBRARY_PATH ${path}:)
+ else()
+ AppendTestEnvVar(${test_title} LD_LIBRARY_PATH ${path}:)
+ endif()
</pre>
</blockquote>
<pre class="moz-quote-pre" wrap="">please add unset(LIBS_${test_name})
</pre>
</blockquote>
<pre class="moz-quote-pre" wrap="">
===================================================================
diff --git a/test/tarantool-tests/CMakeLists.txt b/test/tarantool-tests/CMakeLists.txt
index 74086ca4..297d5801 100644
--- a/test/tarantool-tests/CMakeLists.txt
+++ b/test/tarantool-tests/CMakeLists.txt
@@ -146,6 +146,8 @@ foreach(test_path ${tests})
AppendTestEnvVar(${test_title} LD_LIBRARY_PATH ${path}:)
endif()
endforeach()
+
+ unset(LIBS_${test_name})
endif()
endforeach()
===================================================================
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">+ endforeach()
</pre>
</blockquote>
</blockquote>
<pre class="moz-quote-pre" wrap="">
<snipped>
</pre>
</blockquote>
</body>
<lt-container></lt-container>
</html>