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 BC51E6E226; Wed, 29 Dec 2021 15:00:08 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org BC51E6E226 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1640779208; bh=CzOnqXMZRW2b0TEGHZyNix01siIPVeT/p5zfT8czie4=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=O6mtIV2avdo88to30M2cn1aNcD1SImFFmVyn18vcyB5/IsiHlcgo5zChoIyKf/07l 4Nt4WKVhhctoAZbo4yhSTf/r/0oxsPKMVmQahzuFz8T0aCa5aU72cdXL4cCgAfit38 HEPokRkz/nnNhRbphBNts86WLVUbJZqUsBB9jxoo= Received: from smtp38.i.mail.ru (smtp38.i.mail.ru [94.100.177.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 577CE6E226 for ; Wed, 29 Dec 2021 15:00:07 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 577CE6E226 Received: by smtp38.i.mail.ru with esmtpa (envelope-from ) id 1n2Xck-0000RF-8G; Wed, 29 Dec 2021 15:00:06 +0300 To: Kirill Yukhin , Igor Munkin Date: Wed, 29 Dec 2021 14:58:10 +0300 Message-Id: <20211229115810.22661-1-skaplun@tarantool.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD94D5EF110843E6A67C325213A5E2C0E449CAC477A2A6F0E15182A05F538085040ED97C677126E128D175E3147D5E840067984C6C366C18B34D393F41D69A43AAA X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE779AAD18609327F83EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006377CC130305260E47D8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D84496BBE86B34AB7F7D6E98E8FC760270117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8BAA867293B0326636D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6AC294AFEFA671E80089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C98DCDA00E0158592998E7F5B7992AD4DD1FB8841AAD09A589C2B6934AE262D3EE7EAB7254005DCEDA7F2BDF556F2EC481E0A4E2319210D9B64D260DF9561598F01A9E91200F654B02F433CA60753AEF28E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34D4E96E2A5B1100E0D058100385A18934A78B1E0011E54E64F03E88D7FD0695496A947ED5584AC5C11D7E09C32AA3244C80D4FC0B4905CE61478791E595075D9C30363D8B7DA7DD44927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojXY22XoowekASWgyiYIBe4g== X-Mailru-Sender: 3B9A0136629DC91206CBC582EFEF4CB419158E14919B8324F6C23CA9863393A30A0FD62E7DB478E6F2400F607609286E924004A7DEC283833C7120B22964430C52B393F8C72A41A84198E0F3ECE9B5443453F38A29522196 X-Mras: Ok Subject: [Tarantool-patches] [PATCH] test: fix dynamic modules loading on macOS 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" 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. Hence the paths are set in test need to be set to `DYLD_LIBRARY_PATH` variable instead of `LD_LIBRARY_PATH` on macOS. --- Branch: https://github.com/tarantool/tarantool/tree/skaplun/gh-noticket-fix-macos-fiber-switch-test-full-ci .../gh-1700-abort-recording-on-fiber-switch.test.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/app-tap/gh-1700-abort-recording-on-fiber-switch.test.lua b/test/app-tap/gh-1700-abort-recording-on-fiber-switch.test.lua index 7b9156c22..47408e5b8 100755 --- a/test/app-tap/gh-1700-abort-recording-on-fiber-switch.test.lua +++ b/test/app-tap/gh-1700-abort-recording-on-fiber-switch.test.lua @@ -25,17 +25,19 @@ if #arg == 0 then test:plan(#checks) + local libext = package.cpath:match('?.(%a+);') local vars = { LUABIN = arg[-1], SCRIPT = arg[0], -- To support out-of-source build use relative paths in repo PATH = arg[-1]:gsub('src/tarantool$', 'test/app-tap'), - SUFFIX = package.cpath:match('?.(%a+);'), + SUFFIX = libext, } local cmd = string.gsub('LUA_CPATH="$LUA_CPATH;/?." ' .. 'LUA_PATH="$LUA_PATH;/?.lua" ' .. - 'LD_LIBRARY_PATH= ' .. + ((libext == 'dylib' and 'DYLD' or 'LD') .. + '_LIBRARY_PATH= ') .. ' 2>&1