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 F0BC598C10F; Fri, 19 Jan 2024 14:44:34 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org F0BC598C10F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1705664675; bh=HPzmK8kReQpF4+16VR3hw+ZheuEY1JJsdzlRv5I9fdU=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=gCsK8hxnTCqkuYFFgHa0vfYNXgLYSLPMRNQJdpKop5JxDjKQ+b7y8xaPz+dZqqicS sA38Ac9CIUimhmsRoHE7hOkzt2GjIdL8HPTokl1C2B1ZMISweKNvzjBWIccK0pe+8A N9zbcZfsulcg3Yk/ldZj8LFlgpcxXda547tAgBos= Received: from smtp16.i.mail.ru (smtp16.i.mail.ru [95.163.41.69]) (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 B2A999885FB for ; Fri, 19 Jan 2024 14:37:19 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org B2A999885FB Received: by smtp16.i.mail.ru with esmtpa (envelope-from ) id 1rQnBX-00FDC7-0E; Fri, 19 Jan 2024 14:37:19 +0300 To: Maxim Kokryashkin , Sergey Bronnikov Date: Fri, 19 Jan 2024 14:32:38 +0300 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9AE5B4AFB3AE2A590E10A57BB36FAC7D4F681D642268DCBB5182A05F538085040C8D2903E4BCD405075E2E7030894E2DA894D94D71697D48CF5492858D671FB4A X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7618B6467FE8F94C6EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637E0A24425AA421BFF8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8CC5D848566549E6104A7462815ECD9E6117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC60CDF180582EB8FBA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18F04B652EEC242312D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269176DF2183F8FC7C088D2E8BEBF93D4B068655334FD4449CB33AC447995A7AD1857739F23D657EF2BD5E8D9A59859A8B6ACFD5AC65D14EB01089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A5FE27CD77BC2764613DE3FD803DF40A2FBE61E0728494EF7BF87CCE6106E1FC07E67D4AC08A07B9B067F1C1C3ABB44F3A9C5DF10A05D560A950611B66E3DA6D700B0A020F03D25A0997E3FB2386030E77 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF3E65BE18E5E42A117D792AC00B35B99CCA067541520B1AEE87C2773CAABDF546007A74C46802367A6197189FEE4B1C7AE63AF50DF8BAB3C4C2073B73720D77F7A74DFFEFA5DC0E7F02C26D483E81D6BE5EF9655DD6DEA7D65774BB76CC95456EEC5B5AD62611EEC62B5AFB4261A09AF0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojJsr4kcGAUCM1/j/sswkuxA== X-DA7885C5: 50FA75C3155EC29122358C9D20223E7BBBB986CF155F5FE9C779BDE8508CD2C8262E2D401490A4A0DB037EFA58388B346E8BC1A9835FDE71 X-Mailru-Sender: 689FA8AB762F7393590D8C940224AE333CF4DD7A210B2500D4224F32565351150FBE9A32752B8C9C2AA642CC12EC09F1FB559BB5D741EB962F61BD320559CF1EFD657A8799238ED55FEEDEB644C299C0ED14614B50AE0675 X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit 15/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" This patch changes `dofile()` to the corresponding `require()` of the helper function. It adds test names and includes the test in . Part of tarantool/tarantool#9398 --- test/LuaJIT-tests/lib/ffi/ffi_metatype.lua | 16 ++++++++-------- test/LuaJIT-tests/lib/ffi/index | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/test/LuaJIT-tests/lib/ffi/ffi_metatype.lua b/test/LuaJIT-tests/lib/ffi/ffi_metatype.lua index 2db717f4..b0054b1a 100644 --- a/test/LuaJIT-tests/lib/ffi/ffi_metatype.lua +++ b/test/LuaJIT-tests/lib/ffi/ffi_metatype.lua @@ -1,6 +1,6 @@ local ffi = require("ffi") -dofile("../common/ffi_util.inc") +local fails = require("common.fails") ffi.cdef[[ typedef struct { int x; } idx1_t; @@ -14,7 +14,7 @@ local function ptreq(a, b) return ffi.cast("void *", a) == ffi.cast("void *", b) end -do +do --- metatype index newindex local nidx = {} local tp = ffi.metatype("idx1_t", { __index = { foo = 99, method = function(c, v) return v end }, @@ -45,7 +45,7 @@ do fails(function(cp) cp.bar = 42 end, cp) end -do +do --- metatype index newindex with upvalues local uc, uk, uv local tp = ffi.metatype("idx2_t", { __index = function(c, k, x, y) @@ -78,7 +78,7 @@ do fails(function(p) p[0] = 11 end, p) end -do +do --- metatype index newindex with upvalues via setmetatable local uc, uk, uv local ti, tn = {}, {} local tp = ffi.metatype("idx3_t", { @@ -103,7 +103,7 @@ do uc, uk, uv = nil, nil, nil end -do +do --- metatype arith local tp tp = ffi.metatype("arith_t", { __add = function(a, b) return tp(a.x+b.x, a.y+b.y) end, @@ -174,7 +174,7 @@ do assert(x == 3000) end -do +do --- metatype GC local count = 0 local tp = ffi.metatype("gc_t", { __gc = function(x) count = count + 1 end, @@ -206,7 +206,7 @@ do assert(count == 103) end -do +do --- metatype new, type change local tp = ffi.metatype([[ struct { static const int Z42 = 42; @@ -236,7 +236,7 @@ struct { assert(o.x == 5) end -do +do --- metatype is other cdata local fb = ffi.new("struct { int x; }", 99) local xt = ffi.metatype("struct { }", { __index = fb }) local o = xt() diff --git a/test/LuaJIT-tests/lib/ffi/index b/test/LuaJIT-tests/lib/ffi/index index 833c31e3..338a6930 100644 --- a/test/LuaJIT-tests/lib/ffi/index +++ b/test/LuaJIT-tests/lib/ffi/index @@ -14,6 +14,7 @@ ffi_jit_arith.lua ffi_jit_call.lua ffi_jit_conv.lua ffi_lex_number.lua +ffi_metatype.lua istype.lua jit_array.lua jit_complex.lua -- 2.43.0