From: Sergey Kaplun via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Maxim Kokryashkin <m.kokryashkin@tarantool.org>, Sergey Bronnikov <sergeyb@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH luajit 16/25] test: enable <ffi_new.lua> in LuaJIT-tests Date: Fri, 19 Jan 2024 14:32:39 +0300 [thread overview] Message-ID: <2b2b822dc9b288c32b8e2ab428376b4479649c8f.1705661401.git.skaplun@tarantool.org> (raw) In-Reply-To: <cover.1705661401.git.skaplun@tarantool.org> This patch changes `dofile()` 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 + 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 -- 2.43.0
next prev parent reply other threads:[~2024-01-19 11:45 UTC|newest] Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-01-19 11:32 [Tarantool-patches] [PATCH luajit 00/25] More tests from LuaJIT-tests, part 1 Sergey Kaplun via Tarantool-patches 2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 01/25] test: prepare lauxilarily libs for LuaJIT-tests Sergey Kaplun via Tarantool-patches 2024-01-23 9:10 ` Sergey Bronnikov via Tarantool-patches 2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 02/25] test: separate LuaJIT helpers from ffi_util.inc Sergey Kaplun via Tarantool-patches 2024-01-23 9:17 ` Sergey Bronnikov via Tarantool-patches 2024-01-23 12:35 ` Sergey Kaplun via Tarantool-patches 2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 03/25] test: enable <ffi_arith_ptr.lua> in LuaJIT-tests Sergey Kaplun via Tarantool-patches 2024-01-23 9:21 ` Sergey Bronnikov via Tarantool-patches 2024-01-23 13:10 ` Sergey Kaplun via Tarantool-patches 2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 04/25] test: enable <ffi_bitfield.lua> " Sergey Kaplun via Tarantool-patches 2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 05/25] test: enable <ffi_call.lua> " Sergey Kaplun via Tarantool-patches 2024-01-23 9:32 ` Sergey Bronnikov via Tarantool-patches 2024-01-23 12:46 ` Sergey Kaplun via Tarantool-patches 2024-01-24 11:05 ` Sergey Kaplun via Tarantool-patches 2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 06/25] test: enable <ffi_callback.lua> " Sergey Kaplun via Tarantool-patches 2024-01-23 9:36 ` Sergey Bronnikov via Tarantool-patches 2024-01-23 12:01 ` Sergey Bronnikov via Tarantool-patches 2024-01-23 12:58 ` Sergey Kaplun via Tarantool-patches 2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 07/25] test: enable <ffi_const.lua> " Sergey Kaplun via Tarantool-patches 2024-01-23 9:38 ` Sergey Bronnikov via Tarantool-patches 2024-01-23 11:59 ` Sergey Bronnikov via Tarantool-patches 2024-01-23 12:52 ` Sergey Kaplun via Tarantool-patches 2024-01-23 12:49 ` Sergey Kaplun via Tarantool-patches 2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 08/25] test: enable <ffi_convert.lua> " Sergey Kaplun via Tarantool-patches 2024-01-23 9:39 ` Sergey Bronnikov via Tarantool-patches 2024-01-23 12:51 ` Sergey Kaplun via Tarantool-patches 2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 09/25] test: enable <ffi_enum.lua> " Sergey Kaplun via Tarantool-patches 2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 10/25] test: enable <ffi_gcstep_recursive.lua> Sergey Kaplun via Tarantool-patches 2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 11/25] test: enable <ffi_jit_arith.lua> in LuaJIT-tests Sergey Kaplun via Tarantool-patches 2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 12/25] test: enable <ffi_jit_call.lua> " Sergey Kaplun via Tarantool-patches 2024-01-24 14:43 ` Sergey Bronnikov via Tarantool-patches 2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 13/25] test: enable <ffi_jit_conv.lua> " Sergey Kaplun via Tarantool-patches 2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 14/25] test: enable <ffi_lex_number.lua> " Sergey Kaplun via Tarantool-patches 2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 15/25] test: enable <ffi_metatype.lua> " Sergey Kaplun via Tarantool-patches 2024-01-19 11:32 ` Sergey Kaplun via Tarantool-patches [this message] 2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 17/25] test: enable <ffi_parse_array.lua> " Sergey Kaplun via Tarantool-patches 2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 18/25] test: enable <ffi_parse_basic.lua> " Sergey Kaplun via Tarantool-patches 2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 19/25] test: enable <ffi_parse_cdef.lua> " Sergey Kaplun via Tarantool-patches 2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 20/25] test: enable <ffi_parse_struct.lua> LuaJIT test Sergey Kaplun via Tarantool-patches 2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 21/25] test: enable <ffi_tabov.lua> " Sergey Kaplun via Tarantool-patches 2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 22/25] test: enable <lightud.lua> " Sergey Kaplun via Tarantool-patches 2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 23/25] test: enable <api_call.lua> " Sergey Kaplun via Tarantool-patches 2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 24/25] test: enable <catch_wrap.lua> " Sergey Kaplun via Tarantool-patches 2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 25/25] test: enable <catch_cpp.lua> " Sergey Kaplun via Tarantool-patches 2024-01-23 9:01 ` [Tarantool-patches] [PATCH luajit 00/25] More tests from LuaJIT-tests, part 1 Sergey Bronnikov 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=2b2b822dc9b288c32b8e2ab428376b4479649c8f.1705661401.git.skaplun@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 luajit 16/25] 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