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 C85836EC60; Thu, 1 Apr 2021 11:22:09 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C85836EC60 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1617265329; bh=5vdDjQvW3fgO/n242C8l1NrnE9C/AUWtnzbTh0wCR4c=; 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=EMoiv7MlKFXPq4vqH7VJtKnKDmcBDtBDIFVtjbZFt/gvHuV/lsz1DjGeBsqYAiVht NC+yUEoeJcihFiI0oG969nAaqtwb2AaPFLrH7VbZfm3NTH3z74JrlFoLCXSEpLIOA5 PuLHtvkLSJgERk7AY2vr2ry9uATihwQFy8Earl6s= Received: from smtp59.i.mail.ru (smtp59.i.mail.ru [217.69.128.39]) (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 0669A6EC60 for ; Thu, 1 Apr 2021 11:22:09 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 0669A6EC60 Received: by smtp59.i.mail.ru with esmtpa (envelope-from ) id 1lRsae-00083j-77; Thu, 01 Apr 2021 11:22:08 +0300 Date: Thu, 1 Apr 2021 11:21:14 +0300 To: Igor Munkin Message-ID: References: <20210330221410.GS29703@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210330221410.GS29703@tarantool.org> X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9ED7173E37F4E32947427BE79D20CABD4ABD7C98AF5DBFD37182A05F5380850400DD67CDF6BBABD76E3EAC6A944F922D29E7A75118CEB64E2D7B28F0CD5EE6724 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE755BE8F535441E38CEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006371D26D2A8652661258638F802B75D45FF914D58D5BE9E6BC131B5C99E7648C95CE99938B3FD79E1DF2A0BDB49498CBEF7EA3D1D18C9475B69A471835C12D1D9774AD6D5ED66289B5278DA827A17800CE77A825AB47F0FC8649FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C390D92131081DE748117882F4460429728AD0CFFFB425014E868A13BD56FB6657E2021AF6380DFAD1A18204E546F3947C0B7D0EA88DDEDAC722CA9DD8327EE4930A3850AC1BE2E7356C9A9530EBF72002C4224003CC83647689D4C264860C145E X-C1DE0DAB: 0D63561A33F958A593C43A27D5B5949D336635ECD1645503993EDF07E19C09B5D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7502E6951B79FF9A3F410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D342B94C1DAF75C4D2282DF3732A48965DE68628DF62CA1470D85C5DC42CF334F50018DB1822562FB541D7E09C32AA3244C599A35B0F08562A4D0FAB33EA8344AC7F94338140B71B8EEFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojetunDCtJ20JdIhZVfkYJFA== X-Mailru-Sender: 3B9A0136629DC91206CBC582EFEF4CB474E416F73C64024A6EF39893B46AC3FF3DE34A6DB328F6A0F2400F607609286E924004A7DEC283833C7120B22964430C52B393F8C72A41A89437F6177E88F7363CDA0F3B3F5B9367 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v2 luajit 02/30] test: add compiling for C libs from PUC-Rio-Lua5.1 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" Igor, Thanks for the review! On 31.03.21, Igor Munkin wrote: > Sergey, > > Thanks for the patch! LGTM, except the nits below. > > I propose the following rewording for commit subject: > | test: build auxiliary C libs from PUC-Rio-Lua5.1 Applied, thanks. > > On 26.03.21, Sergey Kaplun wrote: > > This patch adds commands to create additional LuaC libraries for tests > > Minor: these are not "commands" but "rules". Fixed. > > > in . Also, it renames `luaL_reg` to `luaL_Reg` in > > and to be consistent with the current LuaJIT's LuaC API. > > > > Part of tarantool/tarantool#5845 > > Part of tarantool/tarantool#4473 > > --- > > test/PUC-Lua-5.1-tests/CMakeLists.txt | 3 +- > > test/PUC-Lua-5.1-tests/libs/CMakeLists.txt | 48 +++++++++++++++++++++- > > test/PUC-Lua-5.1-tests/libs/lib1.c | 2 +- > > test/PUC-Lua-5.1-tests/libs/lib2.c | 2 +- > > 4 files changed, 51 insertions(+), 4 deletions(-) > > > > diff --git a/test/PUC-Lua-5.1-tests/CMakeLists.txt b/test/PUC-Lua-5.1-tests/CMakeLists.txt > > index 773db0d..3c31aae 100644 > > --- a/test/PUC-Lua-5.1-tests/CMakeLists.txt > > +++ b/test/PUC-Lua-5.1-tests/CMakeLists.txt > > @@ -16,7 +16,8 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR) > > # variable as proposed in the first case. > > set(LUA_PATH "?\;${CMAKE_CURRENT_SOURCE_DIR}/?.lua") > > Side note: I see no LUA_CPATH, but I grepped the spots where lib*.so are > required and found that package.cpath is tweaked right there. Hence > LUA_CPATH is excess, isn't it? Yep. Also, `LUA_CPATH` isn't mentioned in suite's README. > > > > > > > > diff --git a/test/PUC-Lua-5.1-tests/libs/CMakeLists.txt b/test/PUC-Lua-5.1-tests/libs/CMakeLists.txt > > index f24e7f3..aa64a44 100644 > > --- a/test/PUC-Lua-5.1-tests/libs/CMakeLists.txt > > +++ b/test/PUC-Lua-5.1-tests/libs/CMakeLists.txt > > @@ -4,11 +4,57 @@ > > # See the rationale in the root CMakeLists.txt. > > cmake_minimum_required(VERSION 3.1 FATAL_ERROR) > > > > +# Build additional C libraries for tests. > > +macro(BuildTestCLib lib sources) > > > > > + elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") > > Minor: I personally would strip this option out for all remaining > systems (i.e. *BSD too), since we have no guarantee the CMake defaults > won't be broken on other distros sometime. Feel free to ignore (but > it'll be on your conscience). I prefer not to do this -- if there is another one system with the same behaviour, it should be mentioned explicitly here, to avoid questions in the future. Ignoring. > > > + # XXX: This is necessary mostly for openSUSE builds, see also > > + # https://bugzilla.suse.com/show_bug.cgi?id=1012388. > > + # Just strip out the linker flag to suppress this linker > > + # option. > > + string(REPLACE "-Wl,--no-undefined" "" > > + CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}" > > + ) > > + endif() > > > > > +endmacro() > > + > > +BuildTestCLib(lib1 lib1.c) > > Typo: excess whitespace. > > > +BuildTestCLib(lib11 lib1.c lib11.c) > > +BuildTestCLib(lib2 lib2.c) > > Typo: excess whitespace. Strictly saying they are not excess -- I want to align library sources for easier reading :). Removed. > > > +BuildTestCLib(lib21 lib2.c lib21.c) > > + > > +# Create exact copy of the lib2 library for tests in attrib.lua. > > Typo: s/create exact copy/create the exact copy/. Fixed. > > > +set(LIB2ORIG "${CMAKE_CURRENT_BINARY_DIR}/lib2${CMAKE_SHARED_LIBRARY_SUFFIX}") > > +set(LIB2COPY "${CMAKE_CURRENT_BINARY_DIR}/-lib2${CMAKE_SHARED_LIBRARY_SUFFIX}") > > > > > -- > > 2.31.0 > > > > -- > Best regards, > IM -- Best regards, Sergey Kaplun