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 82356988E4B; Fri, 19 Jan 2024 14:38:34 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 82356988E4B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1705664314; bh=P8TgokrhFM7OQxmnoPz7d08U5FZ3+sulx2sqbpMR2VU=; 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=UUOXWOM0GwsqJtS2eTsZElWCzGbexdR3WA5CTovn9LA3eR3ppqNJEqkEyiN2E7ZoP fKt91BD6a5DA379lyVOHfB8fyTg1PX41M7CxUdwwvRM+5Ol/z386SM8TLjmrVoJoe0 NfEwdzjcd5f/suQvwnB2AbyiB5UXFOR1eeWyWUR8= 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 04C189885E8 for ; Fri, 19 Jan 2024 14:37:04 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 04C189885E8 Received: by smtp16.i.mail.ru with esmtpa (envelope-from ) id 1rQnBH-00FDC7-0D; Fri, 19 Jan 2024 14:37:03 +0300 To: Maxim Kokryashkin , Sergey Bronnikov Date: Fri, 19 Jan 2024 14:32:26 +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: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9AE5B4AFB3AE2A59052EF7646443290C180CE518C4D069C91182A05F5380850402A74F19AC7E971B275E2E7030894E2DACB27165FDFE9B8EA19F0940A565172BD X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7CC84CC3AD347B910EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637498EFEA6A90945838638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D88A3951FEA3ABE131AEF6397E340B6279117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC60CDF180582EB8FBA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18618001F51B5FD3F9D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269176DF2183F8FC7C088D2E8BEBF93D4B068655334FD4449CB9ECD01F8117BC8BEAAAE862A0553A39223F8577A6DFFEA7CA819EB9AE8EA3DE343847C11F186F3C59DAA53EE0834AAEE X-C1DE0DAB: 0D63561A33F958A5349843156A31FD5F3DE3FD803DF40A2FD50A6C4727D14192F87CCE6106E1FC07E67D4AC08A07B9B0CF7CD7A0D5AA5F259C5DF10A05D560A950611B66E3DA6D700B0A020F03D25A0997E3FB2386030E77 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF75D71EF45C6F1B9913A6C6CDE094B32E7FDF32FF1E4D857F68528C2D8F26259F0FDE0425728830096197189FEE4B1C7AF993FDCE102064D59728E2BE4CE7DCEFA74DFFEFA5DC0E7F02C26D483E81D6BE5EF9655DD6DEA7D65774BB76CC95456EEC5B5AD62611EEC62B5AFB4261A09AF0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojJsr4kcGAUCNC/1qjbYnHTg== X-DA7885C5: FEBCECFBED44324F22358C9D20223E7BA7A30E0747C131F76630D5C81469D3D3262E2D401490A4A0DB037EFA58388B346E8BC1A9835FDE71 X-Mailru-Sender: 689FA8AB762F7393590D8C940224AE3331B8EA5ED343164BC65ADBD6339CD41F0FBE9A32752B8C9C2AA642CC12EC09F1FB559BB5D741EB962F61BD320559CF1EFD657A8799238ED55FEEDEB644C299C0ED14614B50AE0675 X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit 03/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 `dofile()` 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