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 2B233988E4F; Fri, 19 Jan 2024 14:38:03 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 2B233988E4F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1705664283; bh=dytmDtEixQd4iIHrOFMxz/93ShlBxWSTzAXOIHWgyHI=; 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=FlrWZp7AMRu87tICXs61rax/OZtO28T73KINt3qd0+UAE6QaFDt/J2pIvVDvH51m+ h6EvVgjTQWd0EAm19dRqlPvRMqr+JO0KL+JZAKxlOs76fR7bGWJBnSjZYloQPQNMX3 fl51ZkjzqbAjJk+YlCTrwjFmXM/ZnOMXvTQ/54xY= 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 479229885E9 for ; Fri, 19 Jan 2024 14:37:03 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 479229885E9 Received: by smtp16.i.mail.ru with esmtpa (envelope-from ) id 1rQnBG-00FDC7-1p; Fri, 19 Jan 2024 14:37:02 +0300 To: Maxim Kokryashkin , Sergey Bronnikov Date: Fri, 19 Jan 2024 14:32:25 +0300 Message-ID: <6dc8864ddf6d90860cf96dff9c5d784a20595b62.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: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD9C4CE30293DC5317395D6394F36AD8F79D705B8024BA04EFB1313CFAB8367EF908E2BE116634AD74D78BB3781FF9E14893AEB4ACD161C3A9B88687216CC303E0CEFBA94EB484632BD X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE705C173BDDADFC82AEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637E80306D42697F3998638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D82635CAC550AA026AB17B81B14D2B597C117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF80095D1E57F4578A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD186FD1C55BDD38FC3FD2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269176DF2183F8FC7C0406C186E56A1B26068655334FD4449CB9ECD01F8117BC8BEAAAE862A0553A39223F8577A6DFFEA7CA819EB9AE8EA3DE343847C11F186F3C59DAA53EE0834AAEE X-C1DE0DAB: 0D63561A33F958A57E6AF458D41A5CEF3DE3FD803DF40A2F345A3CAFE968DDF4F87CCE6106E1FC07E67D4AC08A07B9B04E7D9683544204AF9C5DF10A05D560A950611B66E3DA6D700B0A020F03D25A0997E3FB2386030E77 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CFBBD4A33518BBE318353CDC256E8D931DEFE5AC5E9D722340270682984F5A133B673DC415E80A8BD96197189FEE4B1C7AC58E51DE97513B2C7DC23BB2E5734E20A74DFFEFA5DC0E7F02C26D483E81D6BE5EF9655DD6DEA7D65774BB76CC95456EEC5B5AD62611EEC62B5AFB4261A09AF0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojJsr4kcGAUCNfj0+iUIEGBw== X-DA7885C5: 478A482A26C6647222358C9D20223E7BD4C65DC4662C618A42E163B22A507E83262E2D401490A4A0DB037EFA58388B346E8BC1A9835FDE71 X-Mailru-Sender: 689FA8AB762F7393590D8C940224AE33109120292257A8FD0C0F118A019EE7630FBE9A32752B8C9C2AA642CC12EC09F1FB559BB5D741EB962F61BD320559CF1EFD657A8799238ED55FEEDEB644C299C0ED14614B50AE0675 X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit 02/25] 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 | 10 +++++++++ test/LuaJIT-tests/common/ffi/checktypes.lua | 11 ++++++++++ test/LuaJIT-tests/common/ffi_util.inc | 23 --------------------- 4 files changed, 24 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..60d8449a --- /dev/null +++ b/test/LuaJIT-tests/common/ffi/checkfail.lua @@ -0,0 +1,10 @@ +local ffi = require("ffi") + +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..6d748e3b --- /dev/null +++ b/test/LuaJIT-tests/common/ffi/checktypes.lua @@ -0,0 +1,11 @@ +local ffi = require("ffi") + +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