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 B2FBE98C119; Fri, 19 Jan 2024 14:45:34 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org B2FBE98C119 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1705664734; bh=2wddR/J5O/Anb54b31TYwDrR6OcQI0mVTHK+WKtwqYU=; 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=h6y0bQaZdw+zVjvyy6MzYHTAvV4lRoAmfqz0fvIHngJDiDDiElJKIaY6f7HI7LMn0 /cH+EY249lqJ7P5M85vYRguC+Bj/ATctY2B2CTrhIr8IpG/c2zWr20rpVR/5Nph/3X h7M5fRoqEPV43Mhrkz9nUK9d7C+TYIRUbRrrhrC4= 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 DBF94988E41 for ; Fri, 19 Jan 2024 14:37:23 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org DBF94988E41 Received: by smtp16.i.mail.ru with esmtpa (envelope-from ) id 1rQnBb-00FDC7-0A; Fri, 19 Jan 2024 14:37:23 +0300 To: Maxim Kokryashkin , Sergey Bronnikov Date: Fri, 19 Jan 2024 14:32:40 +0300 Message-ID: <29245a83361d9d688dd46c784866e30fa606383d.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: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9AE5B4AFB3AE2A590E10A57BB36FAC7D4F681D642268DCBB5182A05F5380850405FBC8CC132E04F7B75E2E7030894E2DA91368FE3ED03398C4B1FB5E0216BAAFC X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7DBA72CFE7C57007CEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637D0EEADB0B77E68768638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8F4449AC1C0ADA5A29406A9DCAB2BE138117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC3733B5EC72352B9FA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD1828451B159A507268D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269176DF2183F8FC7C088D2E8BEBF93D4B068655334FD4449CB33AC447995A7AD1857739F23D657EF2BD5E8D9A59859A8B6ACFD5AC65D14EB01089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A5FE232C70DB0F3ECC3DE3FD803DF40A2F537183508B3293F2F87CCE6106E1FC07E67D4AC08A07B9B0034D30FDF2F620DB9C5DF10A05D560A950611B66E3DA6D700B0A020F03D25A0997E3FB2386030E77 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CFA93FEE65ABED6CE9A41E962B7EFB0852D773C8B9730B712DC3852271E5672E5A14755E582FAB3B356197189FEE4B1C7ADC70BE5A041ADD65D8ADE49DBA1EA8E3A74DFFEFA5DC0E7F02C26D483E81D6BE5EF9655DD6DEA7D65774BB76CC95456EEC5B5AD62611EEC62B5AFB4261A09AF0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojJsr4kcGAUCOnS6SkaFlBfQ== X-DA7885C5: B72D5A010FF98C3222358C9D20223E7B5F6F23B8E6915C436C63AD12F8A02148262E2D401490A4A0DB037EFA58388B346E8BC1A9835FDE71 X-Mailru-Sender: 689FA8AB762F7393590D8C940224AE33D4154D6A2DE41133F89BFA7EF9C509580FBE9A32752B8C9C2AA642CC12EC09F1FB559BB5D741EB962F61BD320559CF1EFD657A8799238ED55FEEDEB644C299C0ED14614B50AE0675 X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit 17/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 functions. It adds groups with the names of subtests and enables the test in . Part of tarantool/tarantool#9398 --- test/LuaJIT-tests/lib/ffi/ffi_parse_array.lua | 106 ++++++++++-------- test/LuaJIT-tests/lib/ffi/index | 1 + 2 files changed, 58 insertions(+), 49 deletions(-) diff --git a/test/LuaJIT-tests/lib/ffi/ffi_parse_array.lua b/test/LuaJIT-tests/lib/ffi/ffi_parse_array.lua index 3a9616d7..d3b02759 100644 --- a/test/LuaJIT-tests/lib/ffi/ffi_parse_array.lua +++ b/test/LuaJIT-tests/lib/ffi/ffi_parse_array.lua @@ -1,58 +1,66 @@ local ffi = require("ffi") -dofile("../common/ffi_util.inc") +local checkfail = require("common.ffi.checkfail") +local checktypes = require("common.ffi.checktypes") +local fails = require("common.fails") -checkfail{ - "int [", - "int [-1]", - "int [[1]]", - "int [10][]", - "int [10][?]", - "int [][]", - "int [][?]", - "int [?][]", - "int [?][?]", - "int [0x10000][0x2000]", - "int [256][256][256][256]", - "int [10](void)", - "int (void)[10]", - "int &[10]", - "union { double x; int a[?]; }", -} +do --- checkfail + checkfail{ + "int [", + "int [-1]", + "int [[1]]", + "int [10][]", + "int [10][?]", + "int [][]", + "int [][?]", + "int [?][]", + "int [?][?]", + "int [0x10000][0x2000]", + "int [256][256][256][256]", + "int [10](void)", + "int (void)[10]", + "int &[10]", + "union { double x; int a[?]; }", + } +end -ffi.cdef([[ - typedef int foo1_t[10]; - typedef foo1_t foo2_t[5]; -]]) -assert(ffi.sizeof("foo1_t") == 40) -assert(ffi.sizeof("foo2_t") == 200) +do --- sizeof of arrays + ffi.cdef([[ + typedef int foo1_array_t[10]; + typedef foo1_array_t foo2_array_t[5]; + ]]) + assert(ffi.sizeof("foo1_array_t") == 40) + assert(ffi.sizeof("foo2_array_t") == 200) +end -local P = ffi.sizeof("void *") -checktypes{ - 10, 1, "char [10]", - 4*10, 4, "int [10]", - 4*10, 4, "int [10]", - 4*10*5, 4, "int [10][5]", - 4*10*5*3*2*7, 4, "int [10][5][3][2][7]", - 4*10*5, 4, "int ([10])[5]", - P*10, P, "int *[10]", - P, P, "int (*)[10]", - P*5, P, "int (*[5])[10]", - 8*10, 4, "struct { int x; char y; } [10]", - P*5*10, P, "volatile int *(* const *[5][10])(void)", - nil, 4, "int []", - 4*10, 8, "int __attribute__((aligned(8))) [10]", - 4*10, 8, "__attribute__((aligned(8))) int [10]", - 4*10, 8, "int [10] __attribute__((aligned(8)))", - 97, 1, "char ['a']", - 83, 1, "char ['\\123']", - 79, 1, "char ['\x4F']", - 5, 1, "char [sizeof(\"aa\" \"bb\")]", - 80, 8, "double [10]", -} +do --- checktypes + local P = ffi.sizeof("void *") + checktypes{ + 10, 1, "char [10]", + 4*10, 4, "int [10]", + 4*10, 4, "int [10]", + 4*10*5, 4, "int [10][5]", + 4*10*5*3*2*7, 4, "int [10][5][3][2][7]", + 4*10*5, 4, "int ([10])[5]", + P*10, P, "int *[10]", + P, P, "int (*)[10]", + P*5, P, "int (*[5])[10]", + 8*10, 4, "struct { int x; char y; } [10]", + P*5*10, P, "volatile int *(* const *[5][10])(void)", + nil, 4, "int []", + 4*10, 8, "int __attribute__((aligned(8))) [10]", + 4*10, 8, "__attribute__((aligned(8))) int [10]", + 4*10, 8, "int [10] __attribute__((aligned(8)))", + 97, 1, "char ['a']", + 83, 1, "char ['\\123']", + 79, 1, "char ['\x4F']", + 5, 1, "char [sizeof(\"aa\" \"bb\")]", + 80, 8, "double [10]", + } +end -do +do --- sizeof VLA assert(ffi.sizeof("int [?]", 10) == 4*10) local id = ffi.typeof("const short [?]") assert(ffi.sizeof(id, 10) == 2*10) @@ -64,7 +72,7 @@ do assert(ffi.sizeof(id, 0x3fffffff) == 2*0x3fffffff) end -do +do --- sizeof VLS assert(ffi.sizeof("struct { double x; int a[?]; }", 10) == 8+4*10) local id = ffi.typeof("struct { int x; short a[?]; }") assert(ffi.sizeof(id, 10) == 4+2*10) diff --git a/test/LuaJIT-tests/lib/ffi/index b/test/LuaJIT-tests/lib/ffi/index index e6c1fd0f..89773c0c 100644 --- a/test/LuaJIT-tests/lib/ffi/index +++ b/test/LuaJIT-tests/lib/ffi/index @@ -16,6 +16,7 @@ ffi_jit_conv.lua ffi_lex_number.lua ffi_metatype.lua ffi_new.lua +ffi_parse_array.lua istype.lua jit_array.lua jit_complex.lua -- 2.43.0