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 1497F9DB78E; Mon, 29 Jan 2024 13:59:26 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 1497F9DB78E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1706525966; bh=QjRs7BGZKD5MV6VZPIVrZtCH7/hdRdFA0oBXOWOVn24=; 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=FjDheKaj9rxXeOjIqBxlTm2mZOBLqfkMb4PD6QkJQD3hb2F7eFJjYXJ3GVLBRCXMi mmuMJH0/xy9ndCIItvzj1WLoC0Z7V+z9PxWVTvkXoT1iw3yfxb3ZeN0xZvOmz4dbqP 5JQuj+sE+/WxJWbJuD1e632NyHpN5MJsFqYnExFM= 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 685E59D45DA for ; Mon, 29 Jan 2024 13:49:55 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 685E59D45DA Received: by smtp32.i.mail.ru with esmtpa (envelope-from ) id 1rUPD8-0000000BQ6r-3TC1; Mon, 29 Jan 2024 13:49:55 +0300 To: Maxim Kokryashkin , Sergey Bronnikov Date: Mon, 29 Jan 2024 13:45:20 +0300 Message-ID: <2a5fbe653d26a7a9d3d8d627f7345cd78ceec93a.1706520765.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: 4F1203BC0FB41BD96A58C36AA2E996491AB5482BACCB3FBCCBBF638FE815CE47182A05F538085040E006833F5A93110B33594132A326AF8B628707A4EC34D013DCA417647058147843EB7D3813763A1D X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7CA8E915ACC910FBDEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637175EF79FCE26347D8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8E5B6425CA729FFA9BE1BF1E404F07B8E2E560E005C1B4122CC7F00164DA146DAFE8445B8C89999728AA50765F7900637DCE3DBD6F8E38AFD389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC8D2DCF9CF1F528DBCF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947C68E4D7E803FA7AD52D242C3BD2E3F4C64AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C3C711CAE753D09F11BA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CFED8438A78DFE0A9E1DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C3CD42BCEBB57B85E635872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-C1DE0DAB: 0D63561A33F958A5435D2865CE53CF425002B1117B3ED6966711F0DABFA05E8FF09842853758E9E5823CB91A9FED034534781492E4B8EEAD1E02C13459908652C79554A2A72441328621D336A7BC284946AD531847A6065A535571D14F44ED41 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF27908409109864CA5EDE373B63DE185185DF7674EFB54895047E4D95E7BD526BA96D85E4AF70DF378FB01E7B8BF01A692B81D7CBD4917302B718120DE96C5CC58769498D7DE99D70C226CC413062362A913E6812662D5F2A5EAB5682573093F7837F15F2B5E4A70B33F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojmd9AG1X07oS5Dxoc1UImCA== X-Mailru-Sender: 11C2EC085EDE56FAC07928AF2646A7697EAD49280A4DE4B933594132A326AF8B628707A4EC34D013B7CBEF92542CD7C88B0A2698F12F5C9EC77752E0C033A69E86920BD37369036789A8C6A0E60D2BB63A5DB60FBEB33A8A0DA7A0AF5A3A8387 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 luajit 20/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 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_cdef.lua | 141 ++++++++++--------- test/LuaJIT-tests/lib/ffi/index | 1 + 2 files changed, 77 insertions(+), 65 deletions(-) diff --git a/test/LuaJIT-tests/lib/ffi/ffi_parse_cdef.lua b/test/LuaJIT-tests/lib/ffi/ffi_parse_cdef.lua index 4bb5d903..cc123808 100644 --- a/test/LuaJIT-tests/lib/ffi/ffi_parse_cdef.lua +++ b/test/LuaJIT-tests/lib/ffi/ffi_parse_cdef.lua @@ -1,77 +1,88 @@ local ffi = require("ffi") -dofile("../common/ffi_util.inc") +local checkfail = require("common.ffi.checkfail") +local checktypes = require("common.ffi.checktypes") -checkfail({ - "int", - "int aa1; int aa2 ", - "static int x;", - "static const long long x = 1;", -- NYI - "static const double x = 1;", -- NYI - "static const bool x = 1;", -- NYI (intentional, need true/false) - "struct { static int x = 1; };", - ";;static int y" -}, ffi.cdef) +do --- checkfail + checkfail({ + "int", + "int aa1; int aa2 ", + "static int x;", + "static const long long x = 1;", -- NYI + "static const double x = 1;", -- NYI + "static const bool x = 1;", -- NYI (intentional, need true/false) + "struct { static int x = 1; };", + ";;static int y" + }, ffi.cdef) +end -ffi.cdef[[ -static const int K_42a = 42; -static const char K_42b = 42+256; -static const short K_M1a = 65535; -static const unsigned short K_65535a = 65535; -static const int K_1b = 0xffffffff >> 31; -static const int K_1c = 0xffffffffu >> 31; -static const int K_M1b = (int)0xffffffff >> 31; -]] +do --- constants declarations + ffi.cdef[[ + static const int K_42a = 42; + static const char K_42b = 42+256; + static const short K_M1a = 65535; + static const unsigned short K_65535a = 65535; + static const int K_1b = 0xffffffff >> 31; + static const int K_1c = 0xffffffffu >> 31; + static const int K_M1b = (int)0xffffffff >> 31; + ]] -checktypes{ - 42, 1, "char[K_42a]", - 42, 1, "char[K_42b]", - 1, 1, "char[-K_M1a]", - 65535, 1, "char[K_65535a]", - 1, 1, "char[K_1b]", - 1, 1, "char[K_1c]", - 1, 1, "char[-K_M1b]", -} + checktypes{ + 42, 1, "char[K_42a]", + 42, 1, "char[K_42b]", + 1, 1, "char[-K_M1a]", + 65535, 1, "char[K_65535a]", + 1, 1, "char[K_1b]", + 1, 1, "char[K_1c]", + 1, 1, "char[-K_M1b]", + } +end -ffi.cdef[[ -struct str1 { - enum { - K_99 = 99 - }; - static const int K_55 = 55; -} extk; -]] +do --- constant struct + ffi.cdef[[ + struct str1 { + enum { + K_99 = 99 + }; + static const int K_55 = 55; + } extk; + ]] -checktypes{ - 99, 1, "char[K_99]", - 99, 1, "char[extk.K_99]", - 99, 1, "char[((struct str1)0).K_99]", - 99, 1, "char[((struct str1 *)0)->K_99]", - 55, 1, "char[extk.K_55]", -} + checktypes{ + 99, 1, "char[K_99]", + 99, 1, "char[extk.K_99]", + 99, 1, "char[((struct str1)0).K_99]", + 99, 1, "char[((struct str1 *)0)->K_99]", + 55, 1, "char[extk.K_55]", + } -checkfail{ - "char[K_55]", -} + checkfail{ + "char[K_55]", + } +end -ffi.cdef[[ -extern int func1(void); -extern int func2(); -static int func3(); -static inline int func4(int n) -{ - int i, k = 0; - float x = 1.0f; - for (i = 0; i < n; i++) { - k += i; +do --- parse functions declaration + ffi.cdef[[ + extern int func1(void); + extern int func2(); + static int func3(); + static inline int func4(int n) + { + int i, k = 0; + float x = 1.0f; + for (i = 0; i < n; i++) { + k += i; + } + return k; } - return k; -} -;;; -]] + ;;; + ]] +end -ffi.cdef[[ -int ext1; -extern int ext2; -]] +do --- parse extern + ffi.cdef[[ + int ext1; + extern int ext2; + ]] +end diff --git a/test/LuaJIT-tests/lib/ffi/index b/test/LuaJIT-tests/lib/ffi/index index a805bdd0..12b6387f 100644 --- a/test/LuaJIT-tests/lib/ffi/index +++ b/test/LuaJIT-tests/lib/ffi/index @@ -18,6 +18,7 @@ ffi_metatype.lua ffi_new.lua ffi_parse_array.lua ffi_parse_basic.lua +ffi_parse_cdef.lua istype.lua jit_array.lua jit_complex.lua -- 2.43.0