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 488CA6EC56; Wed, 17 Mar 2021 03:46:34 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 488CA6EC56 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1615941994; bh=wSnJosMbtLvNFnqrIVThdb9xXFD6GElX6pH0vIhXQ08=; 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=dh2BpsRKMIX452RA5n9/cb9aEH3clEmbCGtKTziT5Xm67aUGmwGMENqAn5C9RWeZm +9nUXfTdNcOB0eTqUumgkAf/YOG1PDRjOHaJIVPAPJNclXQ5VwOgNF5IL/31OdR6a6 uzFwS0frqlBBg9ZkCf1lULL67bGGzED1jeYlh+10= Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (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 A7C7D6EC56 for ; Wed, 17 Mar 2021 03:46:32 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org A7C7D6EC56 Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1lMKKV-0004FD-BZ; Wed, 17 Mar 2021 03:46:31 +0300 Date: Wed, 17 Mar 2021 03:46:24 +0300 To: Sergey Kaplun Message-ID: <20210317004624.GR9042@tarantool.org> References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.10.1 (2018-07-13) X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD96485A7A9FC131893DA79D6515A0F039B4831FD7FB0219397182A05F5380850401BA8656302C5A3E81A46142BD806932FF8699545B4010A440281A44A9FA0132E X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE75DF2B1F23425CAE5EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006373CA1E20A7C884AE78638F802B75D45FF914D58D5BE9E6BC131B5C99E7648C95CF89CA98302ED496F5D6F153A3AA76BF504CB8A9FDB12B604A471835C12D1D9774AD6D5ED66289B5278DA827A17800CE77A825AB47F0FC8649FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C3E478A468B35FE767117882F4460429728AD0CFFFB425014E868A13BD56FB6657A7F4EDE966BC389F9E8FC8737B5C224902CFACCC19C6E7D3089D37D7C0E48F6CCF19DD082D7633A0E7DDDDC251EA7DABAAAE862A0553A39223F8577A6DFFEA7CB3E4D57BB3B05F1143847C11F186F3C5E7DDDDC251EA7DABCC89B49CDF41148FA8EF81845B15A4842623479134186CDE6BA297DBC24807EABDAD6C7F3747799A X-C1DE0DAB: 0D63561A33F958A5C36FE66A66004A7432F067F03ABD3CE00A5019FFA95A4F3FD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA75F04B387B5D7535DE410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34FDC9529E4578B99CD0D5C5FA5594ACD00958059E85238C95B2A9B2FC1A9DDC8326BA415C095D1A321D7E09C32AA3244C47D20228BED3BCAA71F73E82EC7B95E763871F383B54D9B3927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojwV/GgY7Z4vWhvrebhbxG0A== X-Mailru-Sender: 689FA8AB762F73936BC43F508A0638222632FBD1A947A4324E23156BBDB5F5B2A7C8D0F45F857DBFE9F1EFEE2F478337FB559BB5D741EB964C8C2C849690F8E70A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v2 luajit 0/5] Adapt lua-Harness 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: 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 the series! I've looked onto the updated version on your branch and it is almost cool! I've polished it a bit: commit message, typos, etc -- you can see the changes on my branch[1] (CI is green[2]). If you're OK with them, I'll push the changeset to the trunk. Speaking about the changes in Tarantool, I almost OK with them except the test/luajit-test-init.lua. Consider the comments below. ================================================================================ diff --git a/cmake/luajit.cmake b/cmake/luajit.cmake index 1c05e085b..3d37164e8 100644 --- a/cmake/luajit.cmake +++ b/cmake/luajit.cmake @@ -40,16 +40,19 @@ set(LUAJIT_TEST_BINARY $ CACHE STRING set(LUAJIT_USE_TEST OFF CACHE BOOL "Generate target" FORCE) -# Enable internal LuaJIT assertions for Tarantool Debug build. # XXX: There is module enabled by default in Tarantool # built in Debug, so we need to tweak LuaJIT testing environment. +# XXX: Also, this script "unloads" internal Tarantool's modules +# and remove globals conflicting with LuaJIT test suites. +set(LUAJIT_TEST_INIT "${PROJECT_SOURCE_DIR}/test/luajit-test-init.lua" + CACHE STRING "Lua code need to be run before tests are started" FORCE) + +# Enable internal LuaJIT assertions for Tarantool Debug build. if(CMAKE_BUILD_TYPE STREQUAL "Debug") set(LUAJIT_USE_APICHECK ON CACHE BOOL "Assertions for the Lua/C API" FORCE) set(LUAJIT_USE_ASSERT ON CACHE BOOL "Assertions for the whole LuaJIT VM" FORCE) - set(LUAJIT_TEST_INIT "${PROJECT_SOURCE_DIR}/test/luajit-test-init.lua" - CACHE STRING "Lua code need to be run before tests are started" FORCE) endif() # Valgrind can be used only with the system allocator. For more diff --git a/test/luajit-test-init.lua b/test/luajit-test-init.lua index bc4af9748..d3f637156 100644 --- a/test/luajit-test-init.lua +++ b/test/luajit-test-init.lua @@ -1,2 +1,16 @@ -- Disable strict for Tarantool. require("strict").off() + +-- XXX: lua-Harness test suite uses it's own tap.lua module +-- that conflicts with the Tarantool's one. +package.loaded.tap = nil +-- XXX: lua-Harness test suite checks that utf8 module presents +-- only in Lua5.3 or moonjit. +utf8 = nil + +-- Add `strict.off()` to `progname` command, that runs child tests # If only strict.off is required for child processes, please mention why # others are not. +-- in some LuaJIT test suites to disable strict there too. +-- Quotes type is important. +-- XXX: luacheck thinks that `arg` is read-only global variable. +-- luacheck: no global +arg[-1] = arg[-1]..' -e "require[[strict]].off()"' # Please, mention how Tarantool parses CLI arguments and why arg[-1] # contains the binary name despite the given flags. # Furthermore, you can get the file path via `debug.getinfo(1).source`, # so you can reassemble LUAJIT_TEST_COMMAND. However, if this is # unnecessary, then nevermind. ================================================================================ On 15.03.21, Sergey Kaplun wrote: > In this patchset lua-Harness test suite is adapted for the LuaJIT fork > and Tarantool. > > Branch: https://github.com/tarantool/luajit/tree/skaplun/gh-5844-adapt-lua-harness-test-suite > Tarantool's branch for tests: > https://github.com/tarantool/tarantool/tree/skaplun/gh-5844-adapt-lua-harness-test-suite > Issues: > * https://github.com/tarantool/tarantool/issues/5844 > * https://github.com/tarantool/tarantool/issues/5473 > > Changes in v2: > * glanced commit message for the first patch > * dropped module renaming > * separate suite introduction and adjustment > * dropped unnecessary commits with disabled tests > > Mergen Imeev (1): > test: add lua-Harness test suite > > Sergey Kaplun (4): > test: adjust lua-Harness suite for LuaJIT > test: adjust lua-Harness test suite for Tarantool > test: disable 241-standalone of lua-Harness suite > test: disable 411-luajit of lua-Harness suite > > > -- > 2.28.0 [1]: https://github.com/tarantool/luajit/tree/imun/gh-5844-adapt-lua-harness-test-suite [2]: https://github.com/tarantool/tarantool/tree/imun/gh-5844-adapt-lua-harness-test-suite > -- Best regards, IM