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 EE03E9857DE; Tue, 23 Jan 2024 12:17:40 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org EE03E9857DE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1706001461; bh=EuQcJfqrFy8Jtvrh+H9VC/kFLQJGUHIix30Guzf8YMU=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=KRnD9dqbMKsb8x2gajI6ZsdteMF209VRr0KbkgvVe2PV73yZL9gmiHTImJIA052Di Mmqiza3h7YuevpGJQrvPjbP6HdPcAtDGeC3nU7oHGm4tHQirkjjEdWjMfb7/bjWg/r BF1RsyCqgSd3kJJ/BGSKkNi2QC7AK531TmCbzw5I= Received: from smtp44.i.mail.ru (smtp44.i.mail.ru [95.163.41.82]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 7356A6DDCEE for ; Tue, 23 Jan 2024 12:17:40 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 7356A6DDCEE Received: by smtp44.i.mail.ru with esmtpa (envelope-from ) id 1rSCuZ-00F5tN-1I; Tue, 23 Jan 2024 12:17:39 +0300 Message-ID: <0c05d0d4-94d6-4efe-a89f-2a5071561c0b@tarantool.org> Date: Tue, 23 Jan 2024 12:17:39 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Sergey Kaplun , Maxim Kokryashkin Cc: tarantool-patches@dev.tarantool.org References: <6dc8864ddf6d90860cf96dff9c5d784a20595b62.1705661401.git.skaplun@tarantool.org> In-Reply-To: <6dc8864ddf6d90860cf96dff9c5d784a20595b62.1705661401.git.skaplun@tarantool.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9AE5B4AFB3AE2A5902CFE8E94CF0C73AC3A7B46DE77E1D653182A05F5380850401C0B03523CD7CB89A43C074D59D7CCB6F18FED9ED09BCF00205EDEA719B04FCC X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE73A0E02362971E860EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637CDA1F22AAA442F218638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8B563DCEF7382489DF24CDD61135CF3CE117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC8C7ADC89C2F0B2A5A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18CB629EEF1311BF91D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EE9647ADFADE5905B197A342136F30543AD8FC6C240DEA76429C9F4D5AE37F343AA9539A8B242431040A6AB1C7CE11FEE34E7D9683544204AF6136E347CC761E07C4224003CC836476E2F48590F00D11D6E2021AF6380DFAD1A18204E546F3947C1D471462564A2E192E808ACE2090B5E1725E5C173C3A84C3C5EA940A35A165FF2DBA43225CD8A89F616AD31D0D18CD5CCE5475246E174218B5C8C57E37DE458BEDA766A37F9254B7 X-C1DE0DAB: 0D63561A33F958A515A4D67B6E667BBDFB56E4B5A3BA3AA589DBBB0D4373EFA9F87CCE6106E1FC07E67D4AC08A07B9B01F9513A7CA91E555CB5012B2E24CD356 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF5E031427C056B1F108A1FB8837F4CB21B7CB5EB9A58A5B280D1752FEFC5838752219C82DFA2AC3F24BEAD515961AA0A7AC0B16E823C3291C4A843EF137350CE7E48CAC7CA610320002C26D483E81D6BE0DBAE6F56676BC7117BB6831D7356A2DEC5B5AD62611EEC62B5AFB4261A09AF0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojGSQVxX8i/5V9vOmLQ4oOww== X-Mailru-Sender: C4F68CFF4024C8867DFDF7C7F2588458ABD83260FED662E49BD77203B44D7F3618023E846E174D2C282EC151BADDC1D3523A6D01B4765B2DFB59E2DDD9FE06B14FA522850F29BC30B0DAF586E7D11B3E67EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 02/25] test: separate LuaJIT helpers from ffi_util.inc 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 Bronnikov via Tarantool-patches Reply-To: Sergey Bronnikov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi, Sergey! thanks for the patch! On 1/19/24 14:32, Sergey Kaplun wrote: > This patch moves common helpers from > into separate files by analogy with . The Why do you need to move to separate files? What is an idea behind it? > `include()` helper isn't touched since it is used in system dependend > tests, which won't be modified for now. > > Part of tarantool/tarantool#9398 > --- > test/LuaJIT-tests/common/fails.lua | 3 +++ > test/LuaJIT-tests/common/ffi/checkfail.lua | 10 +++++++++ > test/LuaJIT-tests/common/ffi/checktypes.lua | 11 ++++++++++ > test/LuaJIT-tests/common/ffi_util.inc | 23 --------------------- > 4 files changed, 24 insertions(+), 23 deletions(-) > create mode 100644 test/LuaJIT-tests/common/fails.lua > create mode 100644 test/LuaJIT-tests/common/ffi/checkfail.lua > create mode 100644 test/LuaJIT-tests/common/ffi/checktypes.lua > > diff --git a/test/LuaJIT-tests/common/fails.lua b/test/LuaJIT-tests/common/fails.lua > new file mode 100644 > index 00000000..d555a2b5 > --- /dev/null > +++ b/test/LuaJIT-tests/common/fails.lua > @@ -0,0 +1,3 @@ > +return function(f, ...) > + if pcall(f, ...) ~= false then error("failure expected", 2) end > +end > diff --git a/test/LuaJIT-tests/common/ffi/checkfail.lua b/test/LuaJIT-tests/common/ffi/checkfail.lua > new file mode 100644 > index 00000000..60d8449a > --- /dev/null > +++ b/test/LuaJIT-tests/common/ffi/checkfail.lua > @@ -0,0 +1,10 @@ > +local ffi = require("ffi") > + please add a comment with function's description > +return function(t, f) > + f = f or ffi.typeof > + for i=1,1e9 do > + local tp = t[i] > + if not tp then break end > + assert(pcall(f, tp) == false, tp) > + end > +end > diff --git a/test/LuaJIT-tests/common/ffi/checktypes.lua b/test/LuaJIT-tests/common/ffi/checktypes.lua > new file mode 100644 > index 00000000..6d748e3b > --- /dev/null > +++ b/test/LuaJIT-tests/common/ffi/checktypes.lua > @@ -0,0 +1,11 @@ > +local ffi = require("ffi") > + please add a comment with function's description > +return function(t) > + for i=1,1e9,3 do > + local tp = t[i+2] > + if not tp then break end > + local id = ffi.typeof(tp) > + assert(ffi.sizeof(id) == t[i], tp) > + assert(ffi.alignof(id) == t[i+1], tp) Why test function contains asserts()? Wouldn't be better to return false/true and raise assert in test itself? same questions below > + end > +end > diff --git a/test/LuaJIT-tests/common/ffi_util.inc b/test/LuaJIT-tests/common/ffi_util.inc > index 1eee8dd9..9604d7b0 100644 > --- a/test/LuaJIT-tests/common/ffi_util.inc > +++ b/test/LuaJIT-tests/common/ffi_util.inc > @@ -4,29 +4,6 @@ > > local ffi = require("ffi") > > -function checkfail(t, f) > - f = f or ffi.typeof > - for i=1,1e9 do > - local tp = t[i] > - if not tp then break end > - assert(pcall(f, tp) == false, tp) > - end > -end > - > -function checktypes(t) > - for i=1,1e9,3 do > - local tp = t[i+2] > - if not tp then break end > - local id = ffi.typeof(tp) > - assert(ffi.sizeof(id) == t[i], tp) > - assert(ffi.alignof(id) == t[i+1], tp) > - end > -end > - > -function fails(f, ...) > - if pcall(f, ...) ~= false then error("failure expected", 2) end > -end > - > local incroot = os.getenv("INCROOT") or "/usr/include" > local cdefs = os.getenv("CDEFS") or "" What for these env variables need? >