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 693EA988E5E; Fri, 19 Jan 2024 14:41:04 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 693EA988E5E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1705664464; bh=BMhzmtfkkY1whWF4UOeoB6t+sM0906HuXSorOVue+Dw=; 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=KiyOIaVSj4X4HzfzW8eDtldRdyf/p3HFWE985vnmn4qnbFZ9FbGdCvq0upVQArT1i CTscEIe3AFGRVU/13L6cnuuD+nILoF8uU8vkwHeircf+JrxAYscDax68CKil+T6kaB zXpVSkV24TTu4pBppyp5pkDQufYv38mLCOy5WDgk= 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 C22D69885F4 for ; Fri, 19 Jan 2024 14:37:08 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C22D69885F4 Received: by smtp16.i.mail.ru with esmtpa (envelope-from ) id 1rQnBM-00FDC7-0D; Fri, 19 Jan 2024 14:37:08 +0300 To: Maxim Kokryashkin , Sergey Bronnikov Date: Fri, 19 Jan 2024 14:32:31 +0300 Message-ID: <546d36fb21e4f1df4dd908aeeeffb20be527cbe9.1705661401.git.skaplun@tarantool.org> 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: 4F1203BC0FB41BD9AE5B4AFB3AE2A5902CFE8E94CF0C73AC3A7B46DE77E1D653182A05F538085040C6E52CDBD0A13C6375E2E7030894E2DACB27165FDFE9B8EA3EDA4918E01E25D5 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7850A3F981F25E362EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063724170451E8B6ECF78638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8F3D36B9F24E30316AEF6397E340B6279117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC1BE95B8C87527B4BA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F44604297287769387670735201E561CDFBCA1751FC26CFBAC0749D213D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269176DF2183F8FC7C088D2E8BEBF93D4B068655334FD4449CB33AC447995A7AD186D8C47C27EEC5E9FD5E8D9A59859A8B68A0907C648FB30DE089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A58ECA0251F1FB77373DE3FD803DF40A2FD50A6C4727D14192F87CCE6106E1FC07E67D4AC08A07B9B0A6C7FFFE744CA7FB9C5DF10A05D560A950611B66E3DA6D700B0A020F03D25A0997E3FB2386030E77 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF2EF84E0F6F50EC92FF235A68281365CAE7E0891EE8036305C43F3345087A9BF3DAFD28DA9052916A6197189FEE4B1C7A268F6F74F739BDB59728E2BE4CE7DCEFA74DFFEFA5DC0E7F02C26D483E81D6BE5EF9655DD6DEA7D65774BB76CC95456EEC5B5AD62611EEC62B5AFB4261A09AF0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojJsr4kcGAUCOqSL/2gVdmPQ== X-DA7885C5: F9484D8CB69B18AA22358C9D20223E7BA7A30E0747C131F7791CCF50908E9F97262E2D401490A4A0DB037EFA58388B346E8BC1A9835FDE71 X-Mailru-Sender: 689FA8AB762F7393590D8C940224AE33CCC7961BAC18FD41C65ADBD6339CD41F0FBE9A32752B8C9C2AA642CC12EC09F1FB559BB5D741EB962F61BD320559CF1EFD657A8799238ED55FEEDEB644C299C0ED14614B50AE0675 X-Mras: Ok Subject: [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" 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 + 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 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") 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 -- 2.43.0