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 221ACA6B9E7; Thu, 1 Feb 2024 18:50:48 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 221ACA6B9E7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1706802648; bh=RqrbvAcMgCr8vBkUajp1ajT712+DnnaS5cYVm4YKFMc=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=hu71dPFqIYudrWzsgWwRnHUGtgRLDfvOroXWovLxCL2TxOhUKnowwu3ob99D3gx6C qGUVljNIeLQ6daW4GYTdGcbepMwal6RTnDfv3afdSaKuBwLsBHudVwvA27TB0tArLF +KpNxRgTQfkl+2AHX+M8pUGURORhRs1iSv0Yt1yc= Received: from smtp49.i.mail.ru (smtp49.i.mail.ru [95.163.41.91]) (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 ACD637346C0 for ; Thu, 1 Feb 2024 18:50:46 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org ACD637346C0 Received: by smtp49.i.mail.ru with esmtpa (envelope-from ) id 1rVZKv-0000000BvYo-3PCx; Thu, 01 Feb 2024 18:50:46 +0300 Message-ID: Date: Thu, 1 Feb 2024 18:50:45 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Sergey Kaplun , Maxim Kokryashkin Cc: tarantool-patches@dev.tarantool.org References: In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9010253A383FA2A7563362C6831DEBD0EDA99A95FFED92801182A05F5380850405E17C27AC3AC70E733594132A326AF8B5C963421D078812469CB7D45CEAE1FAD731EC4501CA84640 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7FBCED7D376B82B5EEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637D58A1C8964E53F0E8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8F335865B55CA4777FB2B13AB495F247AFFACE8D595150FA6CC7F00164DA146DAFE8445B8C89999728AA50765F7900637F924B32C592EA89F389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC82FFDA4F57982C5F4F6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947C4D3DDB508812D90003F1AB874ED890284AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C3D50D4057CCB9F19BBA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CFE478A468B35FE7671DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C3E83E68DE7309FD8D35872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-C1DE0DAB: 0D63561A33F958A5A45979665935C5EC5002B1117B3ED6962801DC8120BEFF564A0A47EBA01A636A823CB91A9FED034534781492E4B8EEAD329DC2EF12373DEABDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF885DDA6214724C1FBE2E70EF09EA31357D2A1B64A893B1FDE3939C21B751F690F85183ADB301C8A8BAF4CF3B87E910B1F461189FF1C45FC535B0A716A156C7B872C2B7107C4F97855F4332CA8FE04980913E6812662D5F2AB9AF64DB4688768036DF5FE9C0001AF333F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojKdLLj0Q7SP/iLXyD9y/chA== X-Mailru-Sender: C4F68CFF4024C8867DFDF7C7F2588458FF2DE87D112ABDAA6750B362712FA5BD9B884D5C93E5DF2AB5EA0DD35B66ED1D645D15D82EE4B272BD6E4642A116CA93524AA66B5ACBE6721EF430B9A63E2A504198E0F3ECE9B5443453F38A29522196 X-Mras: Ok Subject: Re: [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 Bronnikov via Tarantool-patches Reply-To: Sergey Bronnikov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi, Sergey thanks for the patch! LGTM On 1/29/24 13:45, Sergey Kaplun wrote: > 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