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 77DDA9DC601; Mon, 29 Jan 2024 13:51:25 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 77DDA9DC601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1706525485; bh=ZyWIlcy1cNnBypQlm3zffABzQaY3bWH/jpXGMQBJ2UA=; 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=kbCgCD2Hr0kC/OiHByrVU0aln5V/P5+WMeJbt3jFRv2pMKEEqrDxr1d+3Rugenw+T hr4/4g40y9o1Owpwt2KD/jTlCpEGYsIWxO9bYH8NWSjhtN4RqUdjYKhd1yeoBEpa6d cFYwoTKzD7DvKjeo/35f0tyk+AhJ2PqN6+z5FIKA= 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 57A4D9C201E for ; Mon, 29 Jan 2024 13:49:25 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 57A4D9C201E Received: by smtp32.i.mail.ru with esmtpa (envelope-from ) id 1rUPCe-0000000BQ6r-2cM1; Mon, 29 Jan 2024 13:49:25 +0300 To: Maxim Kokryashkin , Sergey Bronnikov Date: Mon, 29 Jan 2024 13:45:04 +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: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD9A2BFDE4DD2630CDA8B2C79D93CB6D7A2ABE72CC87122F737182A05F5380850404C228DA9ACA6FE274DB4643CB8E158E933594132A326AF8B83238E719DC0EEB7DCA41764705814780F40345E41D45524 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE704FFE27C31EF363AEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637260A91F4FDC58E7D8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8F3EFEDC088D41A5EBE1BF1E404F07B8E46DD999D92C75F21CC7F00164DA146DAFE8445B8C89999728AA50765F790063793270F7220657A0A389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC8B861051D4BA689FCF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947C4B1E592663965C8BC0837EA9F3D197644AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C3C9EFC713E70D1A96BA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CFED8438A78DFE0A9E1DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C3AA8C68A3574AB3B435872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-C1DE0DAB: 0D63561A33F958A5049BDA9FEC2174435002B1117B3ED69601D409DC087421A0F09842853758E9E5823CB91A9FED034534781492E4B8EEADFD59DAE6580CC3C3C79554A2A72441328621D336A7BC284946AD531847A6065A535571D14F44ED41 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF17D2F9432F9C61A7A5625BFCDB246D85E828867C0333C34E3F2A6ECC32A469D0329B3AFCBA1AB93D8FB01E7B8BF01A69ADA2851A1A3EE05BB718120DE96C5CC5E5537F0D96C39A70C226CC413062362A913E6812662D5F2A5EAB5682573093F7837F15F2B5E4A70B33F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojmd9AG1X07oS0JKUGyhK3cg== X-Mailru-Sender: 11C2EC085EDE56FAC07928AF2646A769B5B150366458457133594132A326AF8B83238E719DC0EEB7B7CBEF92542CD7C88B0A2698F12F5C9EC77752E0C033A69E86920BD37369036789A8C6A0E60D2BB63A5DB60FBEB33A8A0DA7A0AF5A3A8387 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 luajit 04/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_arith_ptr.lua | 13 ++++++------- test/LuaJIT-tests/lib/ffi/index | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/LuaJIT-tests/lib/ffi/ffi_arith_ptr.lua b/test/LuaJIT-tests/lib/ffi/ffi_arith_ptr.lua index 8cf890c6..f7fac0d8 100644 --- a/test/LuaJIT-tests/lib/ffi/ffi_arith_ptr.lua +++ b/test/LuaJIT-tests/lib/ffi/ffi_arith_ptr.lua @@ -1,6 +1,5 @@ local ffi = require("ffi") - -dofile("../common/ffi_util.inc") +local fails = require("common.fails") ffi.cdef[[ typedef struct { int a,b,c; } foo1_t; @@ -9,7 +8,7 @@ void *malloc(size_t); struct incomplete; ]] -do +do --- base pointer arithmetic and comparisons local a = ffi.new("int[10]") local p1 = a+0 p1[0] = 1; @@ -61,7 +60,7 @@ do assert(b - a == 5) end -do +do --- pointer comparisons for different types local p1 = ffi.cast("void *", 0) local p2 = ffi.cast("int *", 1) assert(p1 == p1) @@ -71,7 +70,7 @@ do assert(p2 ~= nil) end -do +do --- pointer comparisons for functions local f1 = ffi.C.free local f2 = ffi.C.malloc local p1 = ffi.cast("void *", f1) @@ -84,7 +83,7 @@ do fails(function(f1) return f1 + 1 end, f1) end -do +do --- pointer arithmetic for structures local s = ffi.new("foo1_t[10]") local p1 = s+3 p1.a = 1; p1.b = 2; p1.c = 3 @@ -96,7 +95,7 @@ do assert(p1 - p2 == -3) end -do +do --- pointer arithmetic for structure with unknown size local mem = ffi.new("int[1]") local p = ffi.cast("struct incomplete *", mem) fails(function(p) return p+1 end, p) diff --git a/test/LuaJIT-tests/lib/ffi/index b/test/LuaJIT-tests/lib/ffi/index index 59e36dd8..7e046908 100644 --- a/test/LuaJIT-tests/lib/ffi/index +++ b/test/LuaJIT-tests/lib/ffi/index @@ -2,6 +2,7 @@ bit64.lua +luajit>=2.1 cdata_var.lua copy_fill.lua err.lua +ffi_arith_ptr.lua istype.lua jit_array.lua jit_complex.lua -- 2.43.0