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 E4B1A6B962; Wed, 14 Apr 2021 16:55:12 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org E4B1A6B962 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1618408513; bh=GWTV2e54rpDXNKo9EGl9ehjQYOTgR/Pe/DgR9rfmc9M=; 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=LqrFGxdAjZACclS8fAPv52Pvp6qpo3J6t8dcqWNfVMyRbMwmHJu2skkq27Mefye8d ZeveA3KPLYTbPqqok9SJz5OgdQjpMw9nSupGf1128GK2zQ6ZuohClHNAPR5CslKCbg kozG/NwKIcAiUbyJnk0VTYxYg5l5yPhA0FRnQFAI= Received: from smtp35.i.mail.ru (smtp35.i.mail.ru [94.100.177.95]) (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 CEB526BD23 for ; Wed, 14 Apr 2021 16:55:11 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org CEB526BD23 Received: by smtp35.i.mail.ru with esmtpa (envelope-from ) id 1lWfz4-0005Kw-Sz; Wed, 14 Apr 2021 16:55:11 +0300 Date: Wed, 14 Apr 2021 16:54:12 +0300 To: Igor Munkin Message-ID: References: <9f2ac107a3dce0b4a48ecde1aa95ec1f99800916.1618320000.git.skaplun@tarantool.org> <20210413203118.GX29703@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210413203118.GX29703@tarantool.org> X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E74806859AC5FE18436AEED970E897805ADA4182A05F538085040E1CB9BDF44EB6A87D1FB7FB2DC1A8253E96BABBD6E2A8DADB937261BF0531A5C X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7011EB7026DD4A9BAEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006374393CE590E20DA798638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B23BCC3B2A172FB77C45821A09A839682851ACFDFAE348AC99D2E47CDBA5A96583C09775C1D3CA48CFE97D2AE7161E217F117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658378DA827A17800CE7A4F00A9E8C511CEB9FA2833FD35BB23DF004C906525384302BEBFE083D3B9BA73A03B725D353964B0B7D0EA88DDEDAC722CA9DD8327EE493B89ED3C7A6281781026D3A1080F4EF5CC4224003CC83647689D4C264860C145E X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2AD77751E876CB595E8F7B195E1C97831A053E5BA72261DA8EE3E100BA2433E01 X-C1DE0DAB: 0D63561A33F958A5860274F949B5D7942989B23C6CFD83FF304CAA3BD2C4B3DCD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7502E6951B79FF9A3F410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D340297C696F996E38455F551E8D38B12F9447BD95E814361FF94848622729D1FCAB1B8CEFEE4A399581D7E09C32AA3244C6CC39CD06743E31FE866E525B139FF8C8580396430872480FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojrcJA+pXcDunXRULC7/RJIQ== X-Mailru-Sender: 3B9A0136629DC91206CBC582EFEF4CB448A818F382769EFE10E9C87604B076326497AF73A1C7799BF2400F607609286E924004A7DEC283833C7120B22964430C52B393F8C72A41A89437F6177E88F7363CDA0F3B3F5B9367 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit v3 01/29] test: add PUC-Rio Lua 5.1 test suite 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 review! I see fixups on branch and they LGTM. AFAIU, do you want to squash them by yourself? On 13.04.21, Igor Munkin wrote: > Sergey, > > Thanks for the patch! LGTM with the following nits: I fixed them on top > of your branch[1] and guess no re-testing is needed. > > On 13.04.21, Sergey Kaplun wrote: > > This patch adds PUC-Rio Lua 5.1 test suite as a part of the LuaJIT test > > suite. Source code is taken verbatim (except trailing whitespace) from > > https://www.lua.org/tests/lua5.1-tests.tar.gz. > > > > Some tests may fail after this commit. They will be disabled > > or adapted in the next patches. > > > > Part of tarantool/tarantool#5845 > > Part of tarantool/tarantool#4473 > > --- > > > > > diff --git a/test/PUC-Rio-Lua-5.1-tests/CMakeLists.txt b/test/PUC-Rio-Lua-5.1-tests/CMakeLists.txt > > new file mode 100644 > > index 00000000..e3bbc9de > > --- /dev/null > > +++ b/test/PUC-Rio-Lua-5.1-tests/CMakeLists.txt > > @@ -0,0 +1,45 @@ > > +# Test suite that has been added from PUC-Rio Lua 5.1 test archive > > +# in scope of https://github.com/tarantool/tarantool/issues/5845. > > + > > +# See the rationale in the root CMakeLists.txt. > > +cmake_minimum_required(VERSION 3.1 FATAL_ERROR) > > + > > +# XXX: There are two ways to set up the proper environment > > +# described in the suite's README: > > +# * set LUA_PATH to "?;./?.lua" > > +# * or, better yet, set LUA_PATH to "./?.lua;;" and LUA_INIT to > > +# "package.path = '?;'..package.path" > > +# Unfortunately, Tarantool doesn't support LUA_INIT and most > > +# likely it never will. For more info, see > > +# https://github.com/tarantool/tarantool/issues/5744 > > +# Hence, there is no way other than set LUA_PATH environment > > +# variable as proposed in the first case. > > +set(LUA_PATH "?\;${CMAKE_CURRENT_SOURCE_DIR}/?.lua") > > + > > +# Establish PUC-Lua-5.1-tests-prepare target that creates > > Typo: s/PUC-Lua-5.1-tests-prepare/PUC-Rio-Lua-5.1-tests-prepare/. > > > +# subdirectory. > > +add_subdirectory(libs) > > + > > +# TODO: PUC-Rio Lua 5.1 test suite also has special header > > +# and translation unit to check some > > +# internal behaviour of the Lua implementation (see etc/ > > +# directory). It modifies realloc function to check memory > > +# consistency and also contains tests for yield in hooks > > +# and for the Lua C API. > > +# But, unfortunately, depends on specific PUC-Rio > > +# Lua 5.1 internal headers and should be adapted for LuaJIT. > > + > > +add_custom_target(PUC-Rio-Lua-5.1-tests > > + DEPENDS ${LUAJIT_TEST_BINARY} PUC-Lua-5.1-tests-prepare > > Typo: s/PUC-Lua-5.1-tests-prepare/PUC-Rio-Lua-5.1-tests-prepare/. > > > +) > > + > > +add_custom_command(TARGET PUC-Rio-Lua-5.1-tests > > + COMMENT "Running PUC-Rio Lua 5.1 tests" > > + COMMAND > > + env > > + LUA_PATH="${LUA_PATH}\;\;" > > + ${LUAJIT_TEST_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}/all.lua > > + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} > > +) > > + > > +# vim: expandtab tabstop=2 shiftwidth=2 > > > > > diff --git a/test/PUC-Rio-Lua-5.1-tests/libs/CMakeLists.txt b/test/PUC-Rio-Lua-5.1-tests/libs/CMakeLists.txt > > new file mode 100644 > > index 00000000..f24e7f30 > > --- /dev/null > > +++ b/test/PUC-Rio-Lua-5.1-tests/libs/CMakeLists.txt > > @@ -0,0 +1,18 @@ > > +# Test suite that has been added from PUC-Rio Lua 5.1 test archive > > +# in scope of https://github.com/tarantool/tarantool/issues/5845. > > + > > +# See the rationale in the root CMakeLists.txt. > > +cmake_minimum_required(VERSION 3.1 FATAL_ERROR) > > + > > +# The original tarball contains subdirectory "libs" with an empty > > +# subdirectory "libs/P1", to be used by tests. > > +# Instead of tracking empty directory with some anchor-file for > > +# git, create this directory via CMake. > > +add_custom_target(PUC-Lua-5.1-tests-prepare) > > +add_custom_command(TARGET PUC-Lua-5.1-tests-prepare > > Typo: s/PUC-Lua-5.1-tests-prepare/PUC-Rio-Lua-5.1-tests-prepare/g. > > > + COMMENT "Create directory for PUC-Rio Lua 5.1 tests" > > + COMMAND ${CMAKE_COMMAND} -E make_directory P1 > > + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} > > +) > > + > > +# vim: expandtab tabstop=2 shiftwidth=2 > > > > > -- > > 2.31.0 > > > > [1]: https://github.com/tarantool/luajit/commit/47deba2 > > -- > Best regards, > IM -- Best regards, Sergey Kaplun