From: Sergey Bronnikov via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Sergey Kaplun <skaplun@tarantool.org>, Maxim Kokryashkin <m.kokryashkin@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH v2 luajit 17/26] test: enable <ffi_new.lua> in LuaJIT-tests Date: Mon, 5 Feb 2024 16:03:22 +0300 [thread overview] Message-ID: <ed45afe0-3823-43de-b2fc-0e370aea54bc@tarantool.org> (raw) In-Reply-To: <ac6a07edb0c111aee9252c127c06d7bdd84a93a6.1706520765.git.skaplun@tarantool.org> Hi, Sergey thanks for the patch! LGTM with minor comments On 1/29/24 13:45, 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 function. It adds groups with the > names of subtests and enables the test in <index>. It renames structures > 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_new.lua | 50 +++++++++++++-------------- > test/LuaJIT-tests/lib/ffi/index | 1 + > 2 files changed, 26 insertions(+), 25 deletions(-) > > diff --git a/test/LuaJIT-tests/lib/ffi/ffi_new.lua b/test/LuaJIT-tests/lib/ffi/ffi_new.lua > index 9cdbd538..e5b19053 100644 > --- a/test/LuaJIT-tests/lib/ffi/ffi_new.lua > +++ b/test/LuaJIT-tests/lib/ffi/ffi_new.lua > @@ -1,37 +1,37 @@ > local ffi = require("ffi") > local bit = require("bit") > > -dofile("../common/ffi_util.inc") > +local fails = require("common.fails") > > ffi.cdef([[ > -typedef struct { int a,b,c; } foo1_t; > -typedef int foo2_t[?]; > +typedef struct { int a,b,c; } foo1_new_t; > +typedef int foo2_new_t[?]; > void *malloc(size_t size); > void free(void *ptr); > ]]) > > -do > - assert(ffi.sizeof("foo1_t") == 12) > - local cd = ffi.new("foo1_t") > +do --- foo1_new_t test desc says nothing about what test tests. I would rename to something like "ffi.sizeof with custom struct" same below > + assert(ffi.sizeof("foo1_new_t") == 12) > + local cd = ffi.new("foo1_new_t") > assert(ffi.sizeof(cd) == 12) > - local foo1_t = ffi.typeof("foo1_t") > - assert(ffi.sizeof(foo1_t) == 12) > - cd = foo1_t() > + local foo1_new_t = ffi.typeof("foo1_new_t") > + assert(ffi.sizeof(foo1_new_t) == 12) > + cd = foo1_new_t() > assert(ffi.sizeof(cd) == 12) > end > > -do > - assert(ffi.sizeof("foo2_t", 3) == 12) > - local cd = ffi.new("foo2_t", 3) > +do --- foo2_new_t > + assert(ffi.sizeof("foo2_new_t", 3) == 12) > + local cd = ffi.new("foo2_new_t", 3) > assert(ffi.sizeof(cd) == 12) > - local foo2_t = ffi.typeof("foo2_t") > - fails(ffi.sizeof, foo2_t) > - assert(ffi.sizeof(foo2_t, 3) == 12) > - cd = foo2_t(3) > + local foo2_new_t = ffi.typeof("foo2_new_t") > + fails(ffi.sizeof, foo2_new_t) > + assert(ffi.sizeof(foo2_new_t, 3) == 12) > + cd = foo2_new_t(3) > assert(ffi.sizeof(cd) == 12) > end > > -do > +do --- byte to int cast > local tpi = ffi.typeof("int") > local tpb = ffi.typeof("uint8_t") > local t = {} > @@ -42,7 +42,7 @@ do > assert(x == 199*257 + 1) > end > > -do > +do --- aligned structure GC > local oc = collectgarbage("count") > for al=0,15 do > local align = 2^al -- 1, 2, 4, ..., 32768 > @@ -54,17 +54,17 @@ do > end > end > local nc = collectgarbage("count") > - assert(nc < oc + 3000, "GC step missing for ffi.new") > + assert(nc < oc * 10, "GC step missing for ffi.new") > end > > -do > +do --- VLA > local t = {} > for i=1,100 do t[i] = ffi.new("int[?]", i) end > assert(ffi.sizeof(t[100]) == 400) > for i=0,99 do assert(t[100][i] == 0) end > end > > -do > +do --- VLS > local t = {} > local ct = ffi.typeof("struct { double x; int y[?];}") > for i=1,100 do t[i] = ct(i) end > @@ -72,7 +72,7 @@ do > for i=0,99 do assert(t[100].y[i] == 0) end > end > > -do > +do --- aligned(16) structure exit from trace > local ct = ffi.typeof("struct __attribute__((aligned(16))) { int x; }") > local y > for i=1,200 do > @@ -82,7 +82,7 @@ do > assert(bit.band(ffi.cast("intptr_t", ffi.cast("void *", y)), 15) == 0) > end > > -do > +do --- cdata resurrecting > local q > local p = ffi.gc(ffi.new("int[1]"), function(x) q = x end) > p = nil > @@ -93,13 +93,13 @@ do > assert(q == nil) > end > > -do > +do --- GC malloc free > local p = ffi.gc(ffi.C.malloc(2^20), ffi.C.free) > p = nil > collectgarbage() > end > > -do > +do --- test lua_close() cleanup > local p = ffi.gc(ffi.new("int[1]"), function(x) assert(type(x) == "cdata") end) > -- test for lua_close() cleanup. > end > diff --git a/test/LuaJIT-tests/lib/ffi/index b/test/LuaJIT-tests/lib/ffi/index > index 338a6930..e6c1fd0f 100644 > --- a/test/LuaJIT-tests/lib/ffi/index > +++ b/test/LuaJIT-tests/lib/ffi/index > @@ -15,6 +15,7 @@ ffi_jit_call.lua > ffi_jit_conv.lua > ffi_lex_number.lua > ffi_metatype.lua > +ffi_new.lua > istype.lua > jit_array.lua > jit_complex.lua
next prev parent reply other threads:[~2024-02-05 13:03 UTC|newest] Thread overview: 144+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-01-29 10:45 [Tarantool-patches] [PATCH v2 luajit 00/26] More tests from LuaJIT-tests, part 1 Sergey Kaplun via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 01/26] cmake: introduce AddTestLib macro Sergey Kaplun via Tarantool-patches 2024-01-31 11:25 ` Maxim Kokryashkin via Tarantool-patches 2024-02-06 11:23 ` Sergey Kaplun via Tarantool-patches 2024-02-09 14:48 ` Maxim Kokryashkin via Tarantool-patches 2024-02-01 14:20 ` Sergey Bronnikov via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 02/26] test: prepare lauxilarily libs for LuaJIT-tests Sergey Kaplun via Tarantool-patches 2024-01-31 11:48 ` Maxim Kokryashkin via Tarantool-patches 2024-02-06 11:24 ` Sergey Kaplun via Tarantool-patches 2024-02-09 14:50 ` Maxim Kokryashkin via Tarantool-patches 2024-02-01 14:23 ` Sergey Bronnikov via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 03/26] test: separate LuaJIT helpers from ffi_util.inc Sergey Kaplun via Tarantool-patches 2024-01-31 11:58 ` Maxim Kokryashkin via Tarantool-patches 2024-02-06 11:47 ` Sergey Kaplun via Tarantool-patches 2024-02-09 14:51 ` Maxim Kokryashkin via Tarantool-patches 2024-02-01 15:45 ` Sergey Bronnikov via Tarantool-patches 2024-02-06 11:48 ` Sergey Kaplun via Tarantool-patches 2024-02-07 6:49 ` Sergey Bronnikov via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 04/26] test: enable <ffi_arith_ptr.lua> in LuaJIT-tests Sergey Kaplun via Tarantool-patches 2024-01-31 12:21 ` Maxim Kokryashkin via Tarantool-patches 2024-02-01 15:50 ` Sergey Bronnikov via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 05/26] test: enable <ffi_bitfield.lua> " Sergey Kaplun via Tarantool-patches 2024-01-31 12:26 ` Maxim Kokryashkin via Tarantool-patches 2024-02-06 11:54 ` Sergey Kaplun via Tarantool-patches 2024-02-09 14:52 ` Maxim Kokryashkin via Tarantool-patches 2024-02-01 15:52 ` Sergey Bronnikov via Tarantool-patches 2024-02-06 11:55 ` Sergey Kaplun via Tarantool-patches 2024-02-07 6:50 ` Sergey Bronnikov via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 06/26] test: enable <ffi_call.lua> " Sergey Kaplun via Tarantool-patches 2024-01-31 12:34 ` Maxim Kokryashkin via Tarantool-patches 2024-02-01 15:58 ` Sergey Bronnikov via Tarantool-patches 2024-02-06 12:01 ` Sergey Kaplun via Tarantool-patches 2024-02-07 6:50 ` Sergey Bronnikov via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 07/26] test: enable <ffi_callback.lua> " Sergey Kaplun via Tarantool-patches 2024-01-31 13:02 ` Maxim Kokryashkin via Tarantool-patches 2024-02-01 16:01 ` Sergey Bronnikov via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 08/26] test: enable <ffi_const.lua> " Sergey Kaplun via Tarantool-patches 2024-01-31 14:32 ` Maxim Kokryashkin via Tarantool-patches 2024-02-06 12:09 ` Sergey Kaplun via Tarantool-patches 2024-02-09 14:52 ` Maxim Kokryashkin via Tarantool-patches 2024-02-01 14:32 ` Sergey Bronnikov via Tarantool-patches 2024-02-06 12:10 ` Sergey Kaplun via Tarantool-patches 2024-02-07 6:52 ` Sergey Bronnikov via Tarantool-patches 2024-02-01 16:02 ` Sergey Bronnikov via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 09/26] test: enable <ffi_convert.lua> " Sergey Kaplun via Tarantool-patches 2024-01-31 14:55 ` Maxim Kokryashkin via Tarantool-patches 2024-02-06 13:11 ` Sergey Kaplun via Tarantool-patches 2024-02-06 14:03 ` Sergey Kaplun via Tarantool-patches 2024-02-09 14:58 ` Maxim Kokryashkin via Tarantool-patches 2024-02-01 16:06 ` Sergey Bronnikov via Tarantool-patches 2024-02-06 13:13 ` Sergey Kaplun via Tarantool-patches 2024-02-01 16:19 ` Sergey Bronnikov via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 10/26] test: enable <ffi_enum.lua> " Sergey Kaplun via Tarantool-patches 2024-01-31 14:59 ` Maxim Kokryashkin via Tarantool-patches 2024-02-01 16:07 ` Sergey Bronnikov via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 11/26] test: enable <ffi_gcstep_recursive.lua> Sergey Kaplun via Tarantool-patches 2024-01-31 15:07 ` Maxim Kokryashkin via Tarantool-patches 2024-02-06 13:23 ` Sergey Kaplun via Tarantool-patches 2024-02-09 14:58 ` Maxim Kokryashkin via Tarantool-patches 2024-02-01 16:10 ` Sergey Bronnikov via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 12/26] test: enable <ffi_jit_arith.lua> in LuaJIT-tests Sergey Kaplun via Tarantool-patches 2024-01-31 15:15 ` Maxim Kokryashkin via Tarantool-patches 2024-02-06 13:29 ` Sergey Kaplun via Tarantool-patches 2024-02-09 14:59 ` Maxim Kokryashkin via Tarantool-patches 2024-02-01 16:12 ` Sergey Bronnikov via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 13/26] test: enable <ffi_jit_call.lua> " Sergey Kaplun via Tarantool-patches 2024-02-01 8:30 ` Maxim Kokryashkin via Tarantool-patches 2024-02-01 16:15 ` Sergey Bronnikov via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 14/26] test: enable <ffi_jit_conv.lua> " Sergey Kaplun via Tarantool-patches 2024-02-01 8:32 ` Maxim Kokryashkin via Tarantool-patches 2024-02-05 12:51 ` Sergey Bronnikov via Tarantool-patches 2024-02-06 13:33 ` Sergey Kaplun via Tarantool-patches 2024-02-07 6:53 ` Sergey Bronnikov via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 15/26] test: enable <ffi_lex_number.lua> " Sergey Kaplun via Tarantool-patches 2024-02-01 8:38 ` Maxim Kokryashkin via Tarantool-patches 2024-02-06 13:39 ` Sergey Kaplun via Tarantool-patches 2024-02-09 16:03 ` Maxim Kokryashkin via Tarantool-patches 2024-02-05 12:53 ` Sergey Bronnikov via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 16/26] test: enable <ffi_metatype.lua> " Sergey Kaplun via Tarantool-patches 2024-02-01 8:40 ` Maxim Kokryashkin via Tarantool-patches 2024-02-05 12:58 ` Sergey Bronnikov via Tarantool-patches 2024-02-06 13:48 ` Sergey Kaplun via Tarantool-patches 2024-02-07 7:01 ` Sergey Bronnikov via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 17/26] test: enable <ffi_new.lua> " Sergey Kaplun via Tarantool-patches 2024-02-01 8:43 ` Maxim Kokryashkin via Tarantool-patches 2024-02-06 13:55 ` Sergey Kaplun via Tarantool-patches 2024-02-09 16:09 ` Maxim Kokryashkin via Tarantool-patches 2024-02-05 13:03 ` Sergey Bronnikov via Tarantool-patches [this message] 2024-02-06 13:58 ` Sergey Kaplun via Tarantool-patches 2024-02-07 7:51 ` Sergey Bronnikov via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 18/26] test: enable <ffi_parse_array.lua> " Sergey Kaplun via Tarantool-patches 2024-02-01 9:01 ` Maxim Kokryashkin via Tarantool-patches 2024-02-06 14:11 ` Sergey Kaplun via Tarantool-patches 2024-02-09 16:11 ` Maxim Kokryashkin via Tarantool-patches 2024-02-05 13:08 ` Sergey Bronnikov via Tarantool-patches 2024-02-06 14:12 ` Sergey Kaplun via Tarantool-patches 2024-02-07 8:04 ` Sergey Bronnikov via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 19/26] test: enable <ffi_parse_basic.lua> " Sergey Kaplun via Tarantool-patches 2024-02-01 9:03 ` Maxim Kokryashkin via Tarantool-patches 2024-02-06 14:15 ` Sergey Kaplun via Tarantool-patches 2024-02-09 16:12 ` Maxim Kokryashkin via Tarantool-patches 2024-02-05 13:10 ` Sergey Bronnikov via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 20/26] test: enable <ffi_parse_cdef.lua> " Sergey Kaplun via Tarantool-patches 2024-02-01 9:05 ` Maxim Kokryashkin via Tarantool-patches 2024-02-06 14:21 ` Sergey Kaplun via Tarantool-patches 2024-02-09 16:12 ` Maxim Kokryashkin via Tarantool-patches 2024-02-05 13:11 ` Sergey Bronnikov via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 21/26] test: enable <ffi_parse_struct.lua> LuaJIT test Sergey Kaplun via Tarantool-patches 2024-02-01 9:16 ` Maxim Kokryashkin via Tarantool-patches 2024-02-06 14:23 ` Sergey Kaplun via Tarantool-patches 2024-02-09 16:13 ` Maxim Kokryashkin via Tarantool-patches 2024-02-05 13:14 ` Sergey Bronnikov via Tarantool-patches 2024-02-06 14:25 ` Sergey Kaplun via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 22/26] test: enable <ffi_tabov.lua> " Sergey Kaplun via Tarantool-patches 2024-02-01 9:19 ` Maxim Kokryashkin via Tarantool-patches 2024-02-06 14:37 ` Sergey Kaplun via Tarantool-patches 2024-02-09 16:13 ` Maxim Kokryashkin via Tarantool-patches 2024-02-05 13:20 ` Sergey Bronnikov via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 23/26] test: enable <lightud.lua> " Sergey Kaplun via Tarantool-patches 2024-02-01 9:23 ` Maxim Kokryashkin via Tarantool-patches 2024-02-06 14:43 ` Sergey Kaplun via Tarantool-patches 2024-02-09 16:14 ` Maxim Kokryashkin via Tarantool-patches 2024-02-05 13:27 ` Sergey Bronnikov via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 24/26] test: enable <api_call.lua> " Sergey Kaplun via Tarantool-patches 2024-02-01 9:25 ` Maxim Kokryashkin via Tarantool-patches 2024-02-06 14:44 ` Sergey Kaplun via Tarantool-patches 2024-02-09 16:15 ` Maxim Kokryashkin via Tarantool-patches 2024-02-05 13:28 ` Sergey Bronnikov via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 25/26] test: enable <catch_wrap.lua> " Sergey Kaplun via Tarantool-patches 2024-02-01 9:31 ` Maxim Kokryashkin via Tarantool-patches 2024-02-05 13:32 ` Sergey Bronnikov via Tarantool-patches 2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 26/26] test: enable <catch_cpp.lua> " Sergey Kaplun via Tarantool-patches 2024-02-01 9:32 ` Maxim Kokryashkin via Tarantool-patches 2024-02-05 13:32 ` Sergey Bronnikov via Tarantool-patches 2024-02-01 16:32 ` [Tarantool-patches] [PATCH v2 luajit 00/26] More tests from LuaJIT-tests, part 1 Sergey Bronnikov via Tarantool-patches 2024-02-06 17:03 ` Sergey Kaplun via Tarantool-patches 2024-02-07 8:06 ` Sergey Bronnikov via Tarantool-patches 2024-02-07 8:14 ` Sergey Bronnikov via Tarantool-patches 2024-02-15 12:49 ` Sergey Kaplun via Tarantool-patches 2024-02-18 11:48 ` Maxim Kokryashkin via Tarantool-patches 2024-02-18 11:54 ` Sergey Kaplun via Tarantool-patches 2024-02-19 8:56 ` Maxim Kokryashkin via Tarantool-patches 2024-02-20 8:10 ` Sergey Bronnikov via Tarantool-patches 2024-02-28 18:25 ` Sergey Kaplun via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=ed45afe0-3823-43de-b2fc-0e370aea54bc@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=m.kokryashkin@tarantool.org \ --cc=sergeyb@tarantool.org \ --cc=skaplun@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v2 luajit 17/26] test: enable <ffi_new.lua> in LuaJIT-tests' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox