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 22A919DC600; Mon, 29 Jan 2024 13:50:55 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 22A919DC600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1706525455; bh=1ewKofQMZfiZeX9FZI8mO59K8PsXJM/bQ2gCWMkxhsU=; 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=zB6Yo582rX6VJCNwQegDD9XFLEjRoHXzkXEFY/8mA9lC11D+NnqG2S8Vp6lkNDRqX GHKtkYR9CBQ2rLQzFbqOa6wZN6vHWRdXtrAl8HVx4yesVlOBnHj/UN26ZzPsEbDjmg lBYG0XwwTv8Y2uuse8PCSFi/skVkh9kACk+EWn/I= 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 DA1CC9C202B for ; Mon, 29 Jan 2024 13:49:24 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org DA1CC9C202B Received: by smtp32.i.mail.ru with esmtpa (envelope-from ) id 1rUPCe-0000000BQ6r-0RJB; Mon, 29 Jan 2024 13:49:24 +0300 To: Maxim Kokryashkin , Sergey Bronnikov Date: Mon, 29 Jan 2024 13:45:03 +0300 Message-ID: <98fb92f07dcd2879a423006642f2bdcd4acfd9f2.1706520765.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: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD96A58C36AA2E99649E4D9784A2E51F17D0BDB9DDD3E04C36B182A05F5380850404DB4643CB8E158E933594132A326AF8B980E17C648E846E9DCA41764705814780F40345E41D45524 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE741DC22BF90A736D8EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006370D24454B2F95E3848638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8F3EFEDC088D41A5EBE1BF1E404F07B8E5B839A012D33BD89CC7F00164DA146DAFE8445B8C89999728AA50765F7900637DCE3DBD6F8E38AFD389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC8B861051D4BA689FCF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947C24F796C710B8583C6E0066C2D8992A164AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C38C9B7DB6C49B7CEFBA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CF27ED053E960B195E1DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C37727919777A35F2B35872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-C1DE0DAB: 0D63561A33F958A5049BDA9FEC2174435002B1117B3ED69691539A680F1E38C7406406D89DD9EB8A823CB91A9FED034534781492E4B8EEAD1E02C13459908652C79554A2A72441328621D336A7BC284946AD531847A6065A535571D14F44ED41 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF05FBC7798C6F05C1362B6F64C1A63A19408D31E477A30ED1A256389E7CB32C44508B3DC588E9D1C78FB01E7B8BF01A69ADA2851A1A3EE05BB718120DE96C5CC553192A490405B6A3C226CC413062362A913E6812662D5F2A5EAB5682573093F7837F15F2B5E4A70B33F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojmd9AG1X07oS0JKUGyhK3cg== X-Mailru-Sender: 11C2EC085EDE56FAC07928AF2646A769B5B150366458457133594132A326AF8B980E17C648E846E9B7CBEF92542CD7C88B0A2698F12F5C9EC77752E0C033A69E86920BD37369036789A8C6A0E60D2BB63A5DB60FBEB33A8A0DA7A0AF5A3A8387 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 luajit 03/26] test: separate LuaJIT helpers from ffi_util.inc 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 moves common helpers from into separate files by analogy with . The `include()` helper isn't touched since it is used in system dependend tests, which won't be modified for now. Part of tarantool/tarantool#9398 --- test/LuaJIT-tests/common/fails.lua | 3 +++ test/LuaJIT-tests/common/ffi/checkfail.lua | 14 +++++++++++++ test/LuaJIT-tests/common/ffi/checktypes.lua | 15 ++++++++++++++ test/LuaJIT-tests/common/ffi_util.inc | 23 --------------------- 4 files changed, 32 insertions(+), 23 deletions(-) create mode 100644 test/LuaJIT-tests/common/fails.lua create mode 100644 test/LuaJIT-tests/common/ffi/checkfail.lua create mode 100644 test/LuaJIT-tests/common/ffi/checktypes.lua diff --git a/test/LuaJIT-tests/common/fails.lua b/test/LuaJIT-tests/common/fails.lua new file mode 100644 index 00000000..d555a2b5 --- /dev/null +++ b/test/LuaJIT-tests/common/fails.lua @@ -0,0 +1,3 @@ +return function(f, ...) + if pcall(f, ...) ~= false then error("failure expected", 2) end +end diff --git a/test/LuaJIT-tests/common/ffi/checkfail.lua b/test/LuaJIT-tests/common/ffi/checkfail.lua new file mode 100644 index 00000000..d3ca74e8 --- /dev/null +++ b/test/LuaJIT-tests/common/ffi/checkfail.lua @@ -0,0 +1,14 @@ +local ffi = require("ffi") + +-- Checker that takes an array of strings that should represent +-- different invalid CTypes (a more common pattern). Also, the +-- second argument may be also the `loadstring` function to check +-- invalid literals or `ffi.cdef` to check invalid C definitions. +return function(t, f) + f = f or ffi.typeof + for i=1,1e9 do + local tp = t[i] + if not tp then break end + assert(pcall(f, tp) == false, tp) + end +end diff --git a/test/LuaJIT-tests/common/ffi/checktypes.lua b/test/LuaJIT-tests/common/ffi/checktypes.lua new file mode 100644 index 00000000..c995d667 --- /dev/null +++ b/test/LuaJIT-tests/common/ffi/checktypes.lua @@ -0,0 +1,15 @@ +local ffi = require("ffi") + +-- Checker that takes an array with the following each 3 elements: +-- 1) Sizeof for the given C type to be checked. +-- 2) Alignof for the given C type to be checked. +-- 3) String representing the C type. +return function(t) + for i=1,1e9,3 do + local tp = t[i+2] + if not tp then break end + local id = ffi.typeof(tp) + assert(ffi.sizeof(id) == t[i], tp) + assert(ffi.alignof(id) == t[i+1], tp) + end +end diff --git a/test/LuaJIT-tests/common/ffi_util.inc b/test/LuaJIT-tests/common/ffi_util.inc index 1eee8dd9..9604d7b0 100644 --- a/test/LuaJIT-tests/common/ffi_util.inc +++ b/test/LuaJIT-tests/common/ffi_util.inc @@ -4,29 +4,6 @@ local ffi = require("ffi") -function checkfail(t, f) - f = f or ffi.typeof - for i=1,1e9 do - local tp = t[i] - if not tp then break end - assert(pcall(f, tp) == false, tp) - end -end - -function checktypes(t) - for i=1,1e9,3 do - local tp = t[i+2] - if not tp then break end - local id = ffi.typeof(tp) - assert(ffi.sizeof(id) == t[i], tp) - assert(ffi.alignof(id) == t[i+1], tp) - end -end - -function fails(f, ...) - if pcall(f, ...) ~= false then error("failure expected", 2) end -end - local incroot = os.getenv("INCROOT") or "/usr/include" local cdefs = os.getenv("CDEFS") or "" -- 2.43.0