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 4E4D36F154; Mon, 15 Aug 2022 15:10:16 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 4E4D36F154 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1660565416; bh=/fIqiBcXiYKF4QULgGVRTZTaIDDbTdb2rIRVASKBzQ8=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=ATVJa8t38vICSthpntI+GJMw6T7ch/oped7xoeN4S9Y0vtfRZE2P7yiWxifYWuXZt humtc9JkBAF6Gb1wcEKFkSaPNN/dU+GLx0YEj9eWwGEMYv5BmgiiddcykcQxuGGIkL zkO2QcGj2yckc2NC3x1Zela7AWLu9aTX4FfiOg48= Received: from smtp63.i.mail.ru (smtp63.i.mail.ru [217.69.128.43]) (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 5C7746F154 for ; Mon, 15 Aug 2022 15:10:14 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 5C7746F154 Received: by smtp63.i.mail.ru with esmtpa (envelope-from ) id 1oNYv7-0007Cu-L1; Mon, 15 Aug 2022 15:10:14 +0300 Message-ID: Date: Mon, 15 Aug 2022 15:10:13 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Content-Language: en-US To: Igor Munkin , Sergey Kaplun Cc: tarantool-patches@dev.tarantool.org References: <668f70ffe4f25725ff4e7a53f5fed7f1505943b0.1660216002.git.imun@tarantool.org> In-Reply-To: <668f70ffe4f25725ff4e7a53f5fed7f1505943b0.1660216002.git.imun@tarantool.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD999D8F08CF16C6CA731EADAD171CF902C5A05C05F0BD67C1200894C459B0CD1B97B1C6A75F6CAC41026CD09C32C8A78EA69C2C31D955D3D95078797E27410A270 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7370F4F695FFFC24BEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006378D7045943A292EC88638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D850CA0154480A20663A9C9F0C3AF65220117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC63AF70AF8205D7DCA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F44604297287769387670735209ECD01F8117BC8BEA471835C12D1D977C4224003CC836476EB9C4185024447017B076A6E789B0E975F5C1EE8F4F765FCC13F6161A30AABF43AA81AA40904B5D9CF19DD082D7633A078D18283394535A93AA81AA40904B5D98AA50765F7900637BECDE000F464C10CD81D268191BDAD3D698AB9A7B718F8C4D1B931868CE1C5781A620F70A64A45A98AA50765F79006372E808ACE2090B5E1725E5C173C3A84C3C5EA940A35A165FF2DBA43225CD8A89FB26E97DCB74E6252262FEC7FBD7D1F5BB5C8C57E37DE458BEDA766A37F9254B7 X-C1DE0DAB: 9604B64F49C60606AD91A466A1DEF99B296C473AB1E142185AC9E3593CE4B31AB1881A6453793CE9274300E5CE05BD4401A9E91200F654B0CEC15DA3DDAC9727627B9FD0EE8BFE98BF91075C897E7FAAAF69ED9BF67C2E669C2B6934AE262D3EE7EAB7254005DCED8DA55E71E02F9FC08E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D349FD10E01B3CDC9E27CBCBAE705FDE7D5BFB1DC2B6EEF02BCCA3AA660BA54E779A1EF3994F6D14ECE1D7E09C32AA3244C71D54A4946D597606C03A72E20515D7233C9DC155518937FFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojKOC4OzB6pCMFMGCZad8jVg== X-Mailru-Sender: 11C2EC085EDE56FAC71737E9F694C0DE7C30B915B80DAEA85F46D74B556DD230AC720016ACD861C2645D15D82EE4B272BD6E4642A116CA93524AA66B5ACBE6721EF430B9A63E2A504198E0F3ECE9B5443453F38A29522196 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 3/8] test: fix tarantool suite for out of source build 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 Bronnikov via Tarantool-patches Reply-To: Sergey Bronnikov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" LGTM, thanks! On 11.08.2022 14:17, Igor Munkin wrote: > jit/vmdef.lua is autogenerated file, so it's put to src/ directory > located in scope of the binary artefacts tree. Before the patch LUA_PATH > lacks this path, so tarantool-tests target fails due to jit/vmdef.lua > misseek. As a result of this change src/ directory in scope of the > binary tree is included to LUA_PATH as well as the one from the source > tree has been. > > Signed-off-by: Igor Munkin > --- > test/tarantool-tests/CMakeLists.txt | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/test/tarantool-tests/CMakeLists.txt b/test/tarantool-tests/CMakeLists.txt > index 27866869..97c23670 100644 > --- a/test/tarantool-tests/CMakeLists.txt > +++ b/test/tarantool-tests/CMakeLists.txt > @@ -70,14 +70,17 @@ add_subdirectory(misclib-sysprof-capi) > > # The part of the memory profiler toolchain is located in tools > # directory, jit, profiler, and bytecode toolchains are located > -# in src/ directory and auxiliary tests-related modules are > -# located in the current directory (but tests are run in the > -# binary directory), so LUA_PATH need to be updated. > +# in src/ directory, jit/vmdef.lua is autogenerated file also > +# located in src/ directory, but in scope of the binary artefacts > +# tree and auxiliary tests-related modules are located in the > +# current directory (but tests are run in the binary directory), > +# so LUA_PATH need to be updated. > make_lua_path(LUA_PATH > PATHS > ${CMAKE_CURRENT_SOURCE_DIR}/?.lua > ${PROJECT_SOURCE_DIR}/tools/?.lua > ${PROJECT_SOURCE_DIR}/src/?.lua > + ${PROJECT_BINARY_DIR}/src/?.lua > ) > # Update LUA_CPATH with the library paths collected within > # macro.