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 310866F158; Thu, 18 Aug 2022 12:52:21 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 310866F158 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1660816341; bh=04ULvqvaksAWOdLehdp8vesjgv67EPG70A+jYETy7sw=; 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=g9UigWQNyJWp2y95Ns7H7TdloWCp2u+Khgbx/+Rywl4oietwYPjCHv3gvrBvpG4D6 GkE+5WsK0LbAdrbONR+0m0hlWiIZSObc5c8c3RkhfSnnRq4QneCu8E+hYZWY5GHHOu +3UyW7GO99YrISMxCawVIHyYFNdC0z5j7eYc+r+A= Received: from smtpng3.i.mail.ru (smtpng3.i.mail.ru [94.100.177.149]) (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 97BB56F158 for ; Thu, 18 Aug 2022 12:52:19 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 97BB56F158 Received: by smtpng3.m.smailru.net with esmtpa (envelope-from ) id 1oOcCI-0006zk-Ri; Thu, 18 Aug 2022 12:52:19 +0300 Date: Thu, 18 Aug 2022 12:49:46 +0300 To: Igor Munkin Message-ID: References: <668f70ffe4f25725ff4e7a53f5fed7f1505943b0.1660216002.git.imun@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <668f70ffe4f25725ff4e7a53f5fed7f1505943b0.1660216002.git.imun@tarantool.org> X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD999D8F08CF16C6CA7380E6FC44ABC918E172B7849A70FF54100894C459B0CD1B9AB1CF3737F02E4AFF33D4A0C17088E6D3A25CB8FAC4E10751A912C66E1114972 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7C6068CE86C2B75F5EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006375045C080FAAE96148638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8108CA5F6CC0C343FF72FEF6B6BADD829117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCE4E369F5EA069656A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18CB629EEF1311BF91D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6753C3A5E0A5AB5B7089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 9604B64F49C60606AD91A466A1DEF99B296C473AB1E142185AC9E3593CE4B31AB1881A6453793CE9274300E5CE05BD4401A9E91200F654B0CEC15DA3DDAC972795B05B7676B1EE853963F33272190C89E2D55A4D37958BBC9C2B6934AE262D3EE7EAB7254005DCED8DA55E71E02F9FC08E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D344EF254DC71474AA3607FF2EE7A129EBBFBA3305B3104EC49DB796A090B09428830F8935E192D7FE51D7E09C32AA3244C43C9E253AB0FC2175903833C3D2D5E7139C99C45E8D137E9FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj7Jv35gwMd2O531K2lvFEVA== X-DA7885C5: 6AF523D3735B3A27B68FB3BF8605B612F4E2609AE9F9578F13C168CD596DF545262E2D401490A4A0DB037EFA58388B346E8BC1A9835FDE71 X-Mailru-Sender: 689FA8AB762F7393CC2E0F076E87284E6D48457287BAFB5F14138C0E9D6275E10FBE9A32752B8C9C2AA642CC12EC09F1FB559BB5D741EB962F61BD320559CF1EFD657A8799238ED55FEEDEB644C299C0ED14614B50AE0675 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 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, Igor! Thanks for the patch! This is really nice to fix this pebble in the shoe! LGTM, except a few typos in comment and the commit message. On 11.08.22, 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 Side note: IINM tarantool-tests are affected due to `jit.bc` usage in the test suite. > misseek. As a result of this change src/ directory in scope of the Typo: s/in scope/in the scope/ > 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 Typo: s/in scope/in the scope/ > +# 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. > -- > 2.34.0 > -- Best regards, Sergey Kaplun