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 786B96F153; Wed, 31 Aug 2022 20:30:34 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 786B96F153 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1661967034; bh=AxpL+fS9xFRf3cJ6a0qsolcPdooLWqQhW0DPigj99gc=; 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=HKV5aXsbNoZ7V8oS8kLuweV76n88MUyvPSVcgJgfA1ksoAh78ejhP7UHVOeLgg5CS FpPfbO09SH1UU4pAwmpBhW1XNVP6Buq7eS0LFQyLWnZg4bvUk0XC6zynPcjEp43pHq zHwC+94CTZxCw9LNFAfjwUZuoXB2uhz1DFsCyRFQ= 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 59E0B6F153 for ; Wed, 31 Aug 2022 20:30:33 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 59E0B6F153 Received: by smtpng3.m.smailru.net with esmtpa (envelope-from ) id 1oTRXs-0003aK-AE; Wed, 31 Aug 2022 20:30:32 +0300 Date: Wed, 31 Aug 2022 20:20:15 +0300 To: Sergey Kaplun Message-ID: References: <668f70ffe4f25725ff4e7a53f5fed7f1505943b0.1660216002.git.imun@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: X-Clacks-Overhead: GNU Terry Pratchett X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9BF9AC82A1D2D72373D7B6BD1783EF43F26EE5E824BBE481C182A05F538085040D6D1529A46A112DD34D3FBBF895CF3C81903FB38328EF7AB729364708D586881 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7B9FBA884A7C9B8BAEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637E31772672C957B658638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D846FDFEFA75F370C7F1565136ADE9682C117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8B2EE5AD8F952D28FBA471835C12D1D977C4224003CC8364762BB6847A3DEAEFB0F43C7A68FF6260569E8FC8737B5C2249EC8D19AE6D49635B68655334FD4449CB9ECD01F8117BC8BEAAAE862A0553A39223F8577A6DFFEA7CB1724D34C644744043847C11F186F3C59DAA53EE0834AAEE X-C1DE0DAB: 9604B64F49C60606AD91A466A1DEF99B296C473AB1E142185AC9E3593CE4B31AB1881A6453793CE9274300E5CE05BD4401A9E91200F654B0D4C601CEA03E70EE523897933F9F83872BBAA48DD8A8A52286654A9C29AF30D69C2B6934AE262D3EE7EAB7254005DCED8DA55E71E02F9FC08E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34E54F8089C01448AAEB6FA3E28E93C301B076F14E95897533E7981A36649613F1EFDDA7166D9B6CDB1D7E09C32AA3244C0D5C65D47770CB00560F9DB960C925F3F522A1CF68F4BE05927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojxzT94hBWypodFzHmiULZDQ== X-DA7885C5: C6DFB363ADDD80191A314084CD7BB078FE84524AA9B9EC37BCB518F20585D082262E2D401490A4A0DB037EFA58388B346E8BC1A9835FDE71 X-Mailru-Sender: 689FA8AB762F7393CC2E0F076E87284E4FEEB2F0437CABDE9A6B8681B20340ABA7C8D0F45F857DBFE9F1EFEE2F478337FB559BB5D741EB964C8C2C849690F8E70A04DAD6CC59E3365FEEDEB644C299C0ED14614B50AE0675 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: Igor Munkin via Tarantool-patches Reply-To: Igor Munkin Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Sergey, Thanks for your review! On 18.08.22, Sergey Kaplun wrote: > 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/ Fixed. > > > 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/ Fixed. > > > +# 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 -- Best regards, IM