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 554409E43EA; Thu, 1 Feb 2024 12:16:28 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 554409E43EA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1706778988; bh=ZkrYyUuIOg5nn37Y41y26yB0/S+Nm0ExKYRmj76+3u0=; 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=u1MXic+SnflloT6c8Zbqq9roTv2rnm2n6lUsx1imsz/O9ygxezeVbYIujywJjaxPG UxGxZsnpJDBLWZKDesn5l1L3HXKovqhAAMyxajApx1oxDSb2pOfG/U8undegGIBvkB 4Vb51ig1iFCXg173mo8aPVWbEKk6a1rsKh02qfBo= Received: from smtp54.i.mail.ru (smtp54.i.mail.ru [95.163.41.89]) (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 D0A719E43E6 for ; Thu, 1 Feb 2024 12:16:26 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D0A719E43E6 Received: by smtp54.i.mail.ru with esmtpa (envelope-from ) id 1rVTBJ-00000005saI-0M0Q; Thu, 01 Feb 2024 12:16:25 +0300 Date: Thu, 1 Feb 2024 12:16:24 +0300 To: Sergey Kaplun Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9A3FCF9DB4FFE09551153315241D8A9C0CDC5E208154705FA182A05F5380850403091923DC4E26118D27678DDAA8063146A2A79DBB8D3FB3442E0A2E5ABDEE8B2ED51035647AA255C X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7D9C4478D0B876341EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006377E3992E1815AFF058638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8F0786F6C0E51EA3A335AD2E10E7A6023F9C381B1B100D1B5CC7F00164DA146DAFE8445B8C89999728AA50765F7900637CAEE156C82D3D7D9389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC81D471462564A2E19F6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947CD56D36E97F3F038C040F9FF01DFDA4A84AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C35AB510A166A9FAEABA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CFE478A468B35FE7671DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C3C74813BC7F81EC8435872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-C1DE0DAB: 0D63561A33F958A5F1A6E55353E29F295002B1117B3ED69640BF97189EBDDE49B74D9144D44E4FCF823CB91A9FED034534781492E4B8EEAD01200A96CB7104FFBDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CFC4C4A84B47F7AE754D94840B7896C15C87F7DFA9235A8FAA1046EE92B42629B2760962882471415BBAF4CF3B87E910B165536D0AB0C6E98972667AAC5405F03D6D1B1E9C2D5748D45F4332CA8FE04980913E6812662D5F2A54F6898A6FDCBDC72A617DFBE5FEC2C6383653B6C8D9AE0FD16FCAA6493B703A X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojqJaWtPsRtykLtSxZiK4now== X-Mailru-Sender: 7940E2A4EB16C9970E7603824FE97C20EBE3A1066FB3AAD21D601ECC04F9671DACC3FF8281141952B6F7D78CE1F58EAD61AD1BC23DFB21333DDE9B364B0DF289BB83A8C3DAEBA78A61AAEF30F77CACB9EAB4BC95F72C04283CDA0F3B3F5B9367 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v2 luajit 21/26] test: enable LuaJIT test 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: Maxim Kokryashkin via Tarantool-patches Reply-To: Maxim Kokryashkin Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi, Sergey! Thanks for the patch! Please consider my comments below. On Mon, Jan 29, 2024 at 01:45:21PM +0300, Sergey Kaplun wrote: > This patch changes `dofile()` (which uses an unreliable relative file > path and mutates `_G` with global functions to be defined) to the > corresponding `require()` of the helper functions. It adds groups with > the names of subtests and enables the test in . > > Part of tarantool/tarantool#9398 > --- > .../LuaJIT-tests/lib/ffi/ffi_parse_struct.lua | 335 +++++++++--------- > test/LuaJIT-tests/lib/ffi/index | 1 + > 2 files changed, 176 insertions(+), 160 deletions(-) > > diff --git a/test/LuaJIT-tests/lib/ffi/ffi_parse_struct.lua b/test/LuaJIT-tests/lib/ffi/ffi_parse_struct.lua > index 16a3d053..cb231c33 100644 > --- a/test/LuaJIT-tests/lib/ffi/ffi_parse_struct.lua > +++ b/test/LuaJIT-tests/lib/ffi/ffi_parse_struct.lua > @@ -1,113 +1,123 @@ > local ffi = require("ffi") > > -dofile("../common/ffi_util.inc") > +local checkfail = require("common.ffi.checkfail") > +local checktypes = require("common.ffi.checktypes") > +local fails = require("common.fails") > > -checkfail{ > - "struct", > - "struct {", > - "struct xx xx {}", > - "struct { int x }", > - "struct { int x, }", > - "struct { int x,y }", > - "struct { void x; }", > - "struct { int x(void); }", > - "struct recursive1 { struct recursive1 { } x; }", > - "union", > - "union {", > - "union xx xx {}", > - "union { int x }", > - "union { int x, }", > - "union { int x,y }", > - "union { void x; }", > - "union { int x(void); }", > - "union recursive1 { union recursive1 { } x; }", > -} > +local P = ffi.sizeof("void *") > +local A = (ffi.arch == "x86" and not ffi.abi("win")) and 4 or 8 > + > +do --- checkfail A more elaborate name would be nice. > + checkfail{ > + "struct", > + "struct {", > + "struct xx xx {}", > + "struct { int x }", > + "struct { int x, }", > + "struct { int x,y }", > + "struct { void x; }",