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 DD501988B79; Tue, 23 Jan 2024 15:55:41 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org DD501988B79 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1706014542; bh=Tar0nXTlPlQHw4dbcd3zUN4+Gt/P60wBnBf8ewIb58U=; 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=WTJGj9Ck8WJKbdi7g2chN449zPKrtWwGtRpsef/HwhvCPNT+/o0Ss5n9reZjL5KOS ljbrSZlGPx5hc1O0w4xPjEcLoMwQ1QDoytBPuC8Z2TA+5EWtFGSisizeR/q0WU6bQv FSgUUgaNAVByEY9HtpOrnhdEPetD6N2pai4mPjiw= Received: from smtp35.i.mail.ru (smtp35.i.mail.ru [95.163.41.76]) (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 EC603988B40 for ; Tue, 23 Jan 2024 15:55:40 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org EC603988B40 Received: by smtp35.i.mail.ru with esmtpa (envelope-from ) id 1rSGJY-00Gzr2-0C; Tue, 23 Jan 2024 15:55:40 +0300 Date: Tue, 23 Jan 2024 15:51:26 +0300 To: Sergey Bronnikov Message-ID: References: <546d36fb21e4f1df4dd908aeeeffb20be527cbe9.1705661401.git.skaplun@tarantool.org> <9005e02f-1188-4003-9ac3-e3de0adf2344@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <9005e02f-1188-4003-9ac3-e3de0adf2344@tarantool.org> X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD936B5060B5AFFD531D38163E095EEACFF3DAE1DB7598F00E9182A05F5380850404C573F8944C8BE33482B0BB327696A1FDA044718601135E0D720F9FB554B0AFC X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7E9A0F80F179600C6EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637D08ED87D5614270A8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8CF989D381FA52327A82584F9A3735657117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC8C7ADC89C2F0B2A5A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18C26CFBAC0749D213D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269176DF2183F8FC7C088D2E8BEBF93D4B068655334FD4449CB9ECD01F8117BC8BEAAAE862A0553A39223F8577A6DFFEA7C0B02670E5FEECA50C4224003CC83647689D4C264860C145E X-C1DE0DAB: 0D63561A33F958A590CF3C77CBF46BD592A01319D272C14D096BB258E19250E2F87CCE6106E1FC07E67D4AC08A07B9B0D2A98E5A6551E3E5BDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CFDC72EDFF4481FBB02AC2E18ADF439FC2CBD0A04BDD08C3F74C7F002DBAD0FDA8212E5196DFD6A13F4BEAD515961AA0A7204E250D1D9BD3F675679DD89F0A5C5CE48CAC7CA610320002C26D483E81D6BE5EF9655DD6DEA7D65774BB76CC95456EEC5B5AD62611EEC62B5AFB4261A09AF0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojGSQVxX8i/5XRzwEy7H+49w== X-DA7885C5: 7111339BC67BF5F4A1775A03CEA67B7A268FA3FDADD6939F893C96922D7AD313262E2D401490A4A0DB037EFA58388B346E8BC1A9835FDE71 X-Mailru-Sender: 689FA8AB762F7393590D8C940224AE335D04C430236B3B1D988D33CE0819B35B0FBE9A32752B8C9C2AA642CC12EC09F1FB559BB5D741EB962F61BD320559CF1EFD657A8799238ED55FEEDEB644C299C0ED14614B50AE0675 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 08/25] test: enable in LuaJIT-tests 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, Sergey! Thanks for the review! Please consider my answers below. On 23.01.24, Sergey Bronnikov wrote: > Hi, Sergey! > > thanks for the patch! > > see comments below > > On 1/19/24 14:32, Sergey Kaplun wrote: > > This patch changes `dofile()` to the corresponding require and renames > > the C library in the `require()` call. It adds groups with the names of > > subtests and enables the test in . It renames structure and enum > > typedefs to avoid conflicts with cdef in other tests. The GC threshold > > is increased since all tests run in a single process, so the number of > > GC objects is greater. > > > > Part of tarantool/tarantool#9398 > > --- > > test/LuaJIT-tests/lib/ffi/ffi_convert.lua | 35 +++++++++++------------ > > test/LuaJIT-tests/lib/ffi/index | 1 + > > 2 files changed, 18 insertions(+), 18 deletions(-) > > > > diff --git a/test/LuaJIT-tests/lib/ffi/ffi_convert.lua b/test/LuaJIT-tests/lib/ffi/ffi_convert.lua > > index bd3fb1f9..284f2b53 100644 > > --- a/test/LuaJIT-tests/lib/ffi/ffi_convert.lua > > +++ b/test/LuaJIT-tests/lib/ffi/ffi_convert.lua > > @@ -1,8 +1,7 @@ > > local ffi = require("ffi") > > > > -local ctest = require("ctest") > > - > > -dofile("../common/ffi_util.inc") > > +local ctest = require("libctest") > > +local fails = require("common.fails") > > > > local tonumber = tonumber > > > > @@ -32,15 +31,15 @@ typedef struct arrinc_t { > > int a[]; > > } arrinc_t; > > > > -typedef enum uenum_t { > > +typedef enum uenum_convert_t { > > UE0, UE71 = 71, UE72 > > -} uenum_t; > > +} uenum_convert_t; > > > > -typedef enum ienum_t { > > +typedef enum ienum_convert_t { > > IE0, IEM12 = -12, IEM11 > > -} ienum_t; > > +} ienum_convert_t; > > > > -typedef struct foo_t { > > +typedef struct foo_convert_t { > > bool b; > > int8_t i8; > > uint8_t u8; > > @@ -79,9 +78,9 @@ typedef struct foo_t { > > int si_guard; > > nest_t sn; > > uni_t ui; > > - uenum_t ue; > > - ienum_t ie; > > -} foo_t; > > + uenum_convert_t ue; > > + ienum_convert_t ie; > > +} foo_convert_t; > > > > char *strcpy(char *dest, const char *src); > > typedef struct FILE FILE; > > @@ -89,11 +88,11 @@ int fileno(FILE *stream); > > int _fileno(FILE *stream); > > ]] > > > > -do > > - local foo_t = ffi.typeof("foo_t") > > - local sz = ffi.sizeof(foo_t) > > - local x = foo_t() > > - local y = foo_t() > > +do --- misc > why three dashes? Three dashes are used before testcase name and parsed by test-runner. > > + local foo_convert_t = ffi.typeof("foo_convert_t") > > + local sz = ffi.sizeof(foo_convert_t) > > + local x = foo_convert_t() > > + local y = foo_convert_t() > > ffi.fill(x, sz, 0xff) > > ffi.fill(y, sz, 0xee) > > > > @@ -769,7 +768,7 @@ do > > x.ppf = ffi.C.strcpy > > end > > > > -do > > +do --- GC cdata __index > why three dashes? Three dashes are used before testcase name and parsed by test-runner. > > collectgarbage() > > local oc = collectgarbage("count") > > local cd = ffi.new"struct { struct { int a; } x;}" > > @@ -780,7 +779,7 @@ do > > for i=1,2 do > > f(cd) > > local nc = collectgarbage("count") > > - assert(nc < oc + 200, "GC step missing for cdata __index") > > + assert(nc < oc * 3, "GC step missing for cdata __index") > Hm, why? See the description in the commit message. > > jit.off(f) > > end > > end > > diff --git a/test/LuaJIT-tests/lib/ffi/index b/test/LuaJIT-tests/lib/ffi/index > > index 0a72daed..5c2be87f 100644 > > --- a/test/LuaJIT-tests/lib/ffi/index > > +++ b/test/LuaJIT-tests/lib/ffi/index > > @@ -7,6 +7,7 @@ ffi_bitfield.lua > > ffi_call.lua > > ffi_callback.lua > > ffi_const.lua > > +ffi_convert.lua > > istype.lua > > jit_array.lua > > jit_complex.lua -- Best regards, Sergey Kaplun