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 089BF9DB79C; Mon, 29 Jan 2024 13:57:26 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 089BF9DB79C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1706525846; bh=9j4mBV0RMisx9xAyPXUmSyGjXP3OF5Fro/uG8gWBp4I=; 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=CVT4K1lRWdkx5P0b6hLWoiQNK9oy74A6lPoYYdze5m/FKAQ6miJEHJFbfa0Hfe6jQ nMh6Ohx5a5hy0y9DfPqj+wEf9x2CLVkX3p3LMq1T9EN69SUBmYgS6CYMRPsdfgJELO jQPdwA/lRM+2uKGe+L37kxNtlB/KYxn4nrT11V5c= Received: from smtp32.i.mail.ru (smtp32.i.mail.ru [95.163.41.73]) (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 2AF859C203C for ; Mon, 29 Jan 2024 13:49:45 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 2AF859C203C Received: by smtp32.i.mail.ru with esmtpa (envelope-from ) id 1rUPCy-0000000BQ6r-2QNz; Mon, 29 Jan 2024 13:49:44 +0300 To: Maxim Kokryashkin , Sergey Bronnikov Date: Mon, 29 Jan 2024 13:45:16 +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: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD96A58C36AA2E99649E4D9784A2E51F17D0BDB9DDD3E04C36B182A05F5380850406A67EA9492C66D4633594132A326AF8BF3D2C09DCC3E19FCDCA4176470581478DC39866218C5191E X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7C4246EADEF98B8F1EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637E2B4A35C1F0E329C8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8FB83AACD22F26755BE1BF1E404F07B8E662D5EC7F91E1166CC7F00164DA146DAFE8445B8C89999728AA50765F7900637DCE3DBD6F8E38AFD389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC8D2DCF9CF1F528DBCF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947C4B1E592663965C8BC0837EA9F3D197644AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C3C9EFC713E70D1A96BA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CFE478A468B35FE7671DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C3AA8C68A3574AB3B435872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-C1DE0DAB: 0D63561A33F958A5980284122D22C7045002B1117B3ED696A35A28796000CD58F5FEB6EB1EB183FD823CB91A9FED034534781492E4B8EEADFD59DAE6580CC3C3C79554A2A72441328621D336A7BC284946AD531847A6065A535571D14F44ED41 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF65C773D38EE8B9B95DB2920219E7B07EB7F38DEFE17786212DF24B36F9ED516AACCA692FBCDC96C28FB01E7B8BF01A698165E3E389FCF590B718120DE96C5CC5A687475DCFF7A648C226CC413062362A913E6812662D5F2A5EAB5682573093F7837F15F2B5E4A70B33F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojmd9AG1X07oRSok7oESw1Sg== X-Mailru-Sender: 11C2EC085EDE56FAC07928AF2646A76988A2AADB8DBC502333594132A326AF8BF3D2C09DCC3E19FCB7CBEF92542CD7C88B0A2698F12F5C9EC77752E0C033A69E86920BD37369036789A8C6A0E60D2BB63A5DB60FBEB33A8A0DA7A0AF5A3A8387 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 luajit 16/26] 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()` (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 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