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 C1888988E67; Fri, 19 Jan 2024 14:41:34 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C1888988E67 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1705664494; bh=aWsciS/lr3P50+FTA1RDqsSB01KSjzKTJeHbHYgc5RI=; 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=W+t+fHzpmi6Nf2e4WH+YH9hxLR0YByWGJwgyxEa4sV0xJcxSTkea3hOOoVz8lM6kb /808QCh7Z5NLkFlRHPw+vqdbNyJl15isgkGQzFtNvw79ZKnLBuRlb4UlgkQpZzQ04U Gz3aNP4d4Y/CR/K6L8DMYpkvTbmyWklelcQ/sMPI= 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 EE63D9885F5 for ; Fri, 19 Jan 2024 14:37:09 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org EE63D9885F5 Received: by smtp16.i.mail.ru with esmtpa (envelope-from ) id 1rQnBN-00FDC7-11; Fri, 19 Jan 2024 14:37:09 +0300 To: Maxim Kokryashkin , Sergey Bronnikov Date: Fri, 19 Jan 2024 14:32:32 +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: 4F1203BC0FB41BD9AE5B4AFB3AE2A590E10A57BB36FAC7D4F681D642268DCBB5182A05F53808504028797C567CCF054B77CA480E2D39EF6FB75AAF8E63C9EFFCAF7AD3A7EC3922F2 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE74AE62C7A8488879AEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063763305FB9D3ECC1898638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8D00B015ED4FB19BBD46DD909F5B7D9D2117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF80095D1E57F4578A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD186FD1C55BDD38FC3FD2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269176DF2183F8FC7C088D2E8BEBF93D4B068655334FD4449CB33AC447995A7AD1857739F23D657EF2BD5E8D9A59859A8B68A0907C648FB30DE089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A5094C70667712786F3DE3FD803DF40A2FFC72FAD20FC545BAF87CCE6106E1FC07E67D4AC08A07B9B0CF7CD7A0D5AA5F259C5DF10A05D560A950611B66E3DA6D700B0A020F03D25A0997E3FB2386030E77 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF6E61E893D81532E50FAFD176B779ACE85A97D92C41F06C889D0B61761DDCE69245F8ED8E1771A93D6197189FEE4B1C7A29F89C437294902809AFCC4BEFCA2A9AA74DFFEFA5DC0E7F02C26D483E81D6BE5EF9655DD6DEA7D65774BB76CC95456EEC5B5AD62611EEC62B5AFB4261A09AF0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojJsr4kcGAUCOiLgXIGQ6J3Q== X-DA7885C5: 255D32CE237B4A9022358C9D20223E7B521D6A16A9BA544D9EF11ED37F806F10262E2D401490A4A0DB037EFA58388B346E8BC1A9835FDE71 X-Mailru-Sender: 689FA8AB762F7393590D8C940224AE33E48F5F39B2CCAEDA83386E10C72C937F0FBE9A32752B8C9C2AA642CC12EC09F1FB559BB5D741EB962F61BD320559CF1EFD657A8799238ED55FEEDEB644C299C0ED14614B50AE0675 X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit 09/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 the `dofile()` to the corresponding `require()` call and renames the C library in the `require()` call. Also, it names all subtests and includes the test in . Part of tarantool/tarantool#9398 --- test/LuaJIT-tests/lib/ffi/ffi_enum.lua | 11 +++++------ test/LuaJIT-tests/lib/ffi/index | 1 + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/LuaJIT-tests/lib/ffi/ffi_enum.lua b/test/LuaJIT-tests/lib/ffi/ffi_enum.lua index e8e40ad0..49c874c7 100644 --- a/test/LuaJIT-tests/lib/ffi/ffi_enum.lua +++ b/test/LuaJIT-tests/lib/ffi/ffi_enum.lua @@ -1,7 +1,7 @@ local ffi = require("ffi") -dofile("../common/ffi_util.inc") +local fails = require("common.fails") ffi.cdef[[ typedef enum enum_i { FOO_I = -1, II = 10 } enum_i; @@ -13,10 +13,9 @@ int call_i_ei(enum_i a) asm("call_i"); int call_i_eu(enum_u a) asm("call_i"); ]] -local C = ffi.load("../clib/ctest") - -do +local C = ffi.load("ctest") +do --- base local t = ffi.new("enum_i[100]") for i=0,99 do t[i] = "II" end for i=0,99 do assert(t[i] == "II") end @@ -42,14 +41,14 @@ do for i=0,99 do assert(t[i] ~= u[i]) end end -do +do --- calls for i=0,99 do assert(C.call_ei_i(9) == "II") end for i=0,99 do assert(C.call_eu_i(9) == "UU") end for i=0,99 do assert(C.call_i_ei("II") == 11) end for i=0,99 do assert(C.call_i_eu("UU") == 11) end end -do +do --- cast to bool local f = ffi.cast("bool (*)(enum_i)", function(e) return e == "II" end) assert(f("II")) assert(not f(0)) diff --git a/test/LuaJIT-tests/lib/ffi/index b/test/LuaJIT-tests/lib/ffi/index index 5c2be87f..b11e5aa4 100644 --- a/test/LuaJIT-tests/lib/ffi/index +++ b/test/LuaJIT-tests/lib/ffi/index @@ -8,6 +8,7 @@ ffi_call.lua ffi_callback.lua ffi_const.lua ffi_convert.lua +ffi_enum.lua istype.lua jit_array.lua jit_complex.lua -- 2.43.0