From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 5C04FEB649F; Tue, 24 Sep 2024 14:28:17 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 5C04FEB649F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1727177297; bh=Hw1FVLPqWeBsx6De1ReeStIvshC+4FQWT8Cc8bfl62I=; h=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=GFU1ZD+H9UxDNgJInYdhpRZe1hcfz1LwyRVNiqids+VeHCJ0tJ1NEOXtDC+0hD0f4 puJX9ymWgb5zum6wHnvR0KywEqfTQbydCUV1RcbE09stOwDMbYUPaCPISIFxb38a/b Vj53+86W1T/1gDbMlSjDUybhhrS5q/mqRnlkFlU0= Received: from smtp59.i.mail.ru (smtp59.i.mail.ru [95.163.41.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id C2E9BEB649C for ; Tue, 24 Sep 2024 14:28:16 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C2E9BEB649C Received: by smtp59.i.mail.ru with esmtpa (envelope-from ) id 1st3iJ-00000003U6Y-1BHW; Tue, 24 Sep 2024 14:28:15 +0300 Date: Tue, 24 Sep 2024 14:28:00 +0300 To: Sergey Bronnikov Message-ID: References: <15a3b416520eac8f799a59fa51c6dcd9515ec90b.1727172936.git.skaplun@tarantool.org> <4c633d2d-2945-4a4a-9571-742c54f8e620@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4c633d2d-2945-4a4a-9571-742c54f8e620@tarantool.org> X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD968D81A599CAF0ABBC1345680966DF287F24EB08D8B60A410182A05F53808504045A754A16952C57BA6D5EE0DB6E1EC8D8A1A40366D30BA947105555182563E811473A5891B7656E9 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE76D34FAA3D8B31588C2099A533E45F2D0395957E7521B51C2CFCAF695D4D8E9FCEA1F7E6F0F101C6778DA827A17800CE7CB9C0C663C74145DEA1F7E6F0F101C6723150C8DA25C47586E58E00D9D99D84E1BDDB23E98D2D38B043BF0FB74779F3640429C57B394D769597190C53026AFA4C97849551F1ABBFCA471835C12D1D9774AD6D5ED66289B5259CC434672EE6371117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658378DA827A17800CE767883B903EA3BAEA9FA2833FD35BB23DF004C906525384302BEBFE083D3B9BA71A620F70A64A45A98AA50765F79006372E808ACE2090B5E1725E5C173C3A84C3C5EA940A35A165FF2DBA43225CD8A89FB26E97DCB74E6252262FEC7FBD7D1F5BB5C8C57E37DE458BEDA766A37F9254B7 X-C1DE0DAB: 0D63561A33F958A55EEE91B1FC75AE725002B1117B3ED696975A568605A790EA1A1B8FE1FED62FE8823CB91A9FED034534781492E4B8EEADB73CFAAED92B6E13BDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADBF74143AD284FC7177DD89D51EBB7742424CF958EAFF5D571004E42C50DC4CA955A7F0CF078B5EC49A30900B95165D34FDC9529E4578B99C595A9454E8DB533E689AA9949F433A74B800AA5F1D2D38F8E8EA9AD50E5065031D7E09C32AA3244CE49A47663AF35DCB921CC9A31F9C4781F18B6E3B7D2DAEAAEA455F16B58544A2557BDE0DD54B3590A5AE236DF995FB59829709634694AABAED6A17656DB59BCAD427812AF56FC65B X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojamSMdo1tbG/Qmc6I+NYIjQ== X-DA7885C5: 3A2B9F432C10B55FF255D290C0D534F921338F257923EA55831C2B5D9869DC12E2A286DE1759B21C5B1A4C17EAA7BC4BEF2421ABFA55128DAF83EF9164C44C7E X-Mailru-Sender: 689FA8AB762F7393C6D0B12EA33CAA9B31D1A83B5BEA15DE1AF2EFB3AEB9C4400B59428D334685A6E49D44BB4BD9522A059A1ED8796F048DB274557F927329BE89D5A3BC2B10C37545BD1C3CC395C826B4A721A3011E896F X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v2 luajit 5/7] test: shrink LUA_CPATH and {DY}LD_LIBRARY_PATH X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Sergey Kaplun via Tarantool-patches Reply-To: Sergey Kaplun Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi, Sergey! Thanks for the review! Fixed your comment and force-pushed the branch. On 24.09.24, Sergey Bronnikov wrote: > 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: > > 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]:https://support.apple.com/en-us/HT204899 > > > > Resolves tarantool/tarantool#9898 > > --- > > + > > + 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 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() > please add unset(LIBS_${test_name}) =================================================================== 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() =================================================================== > > + endforeach() -- Best regards, Sergey Kaplun