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 78D4898C124; Fri, 19 Jan 2024 14:46:34 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 78D4898C124 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1705664794; bh=7iRwlp6V9+3IVkItZlmfh0+IdUCNBQYCLfZyBAl8DKs=; 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=gGBbaid1lvpM1fmsxGnn26tfw3YAyo673bcf9pcS9QdgrAoc/J+K9Qve1P2o7gTeW smEcKNMc18TNVqN5oaMeVO1wh9DzYe6BcItScOcRdzB5Gk+nVIA7EFDdWRCyuWtynI s3qHy58GmmmlW6tzwTvpcjYZPp+XjaA6/u7CnA2s= 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 A3F9E988E42 for ; Fri, 19 Jan 2024 14:37:28 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org A3F9E988E42 Received: by smtp16.i.mail.ru with esmtpa (envelope-from ) id 1rQnBg-00FDC7-01; Fri, 19 Jan 2024 14:37:28 +0300 To: Maxim Kokryashkin , Sergey Bronnikov Date: Fri, 19 Jan 2024 14:32:42 +0300 Message-ID: <16f8f7254d136eea76cce6043a0e783b9c8df4c9.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: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9AE5B4AFB3AE2A590AC960D445231AB294ACF14C8196FF36C182A05F538085040387A3F27B8010CE475E2E7030894E2DAB75AAF8E63C9EFFC0169DE8A8320738D X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE78CB87876C5D626D4EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637F0135404761DA3FC8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8BDD5C73D5368B8972F39E1270A68A975117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC60CDF180582EB8FBA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18F04B652EEC242312D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269176DF2183F8FC7C0FE3A47D6FA29121068655334FD4449CB33AC447995A7AD1857739F23D657EF2BD5E8D9A59859A8B6ACFD5AC65D14EB01089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A5946C5FC252C26D823DE3FD803DF40A2FF6AAE36F1AF2432BF87CCE6106E1FC07E67D4AC08A07B9B0034D30FDF2F620DB9C5DF10A05D560A950611B66E3DA6D700B0A020F03D25A0997E3FB2386030E77 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF54D8DFB3646B6B8554A697A73699F9C9EF29CC668CF290F83A0B160D4A9E4C72284AB208DE0D1BB16197189FEE4B1C7A7E10F1EA46083D9910C3C8871E814994A74DFFEFA5DC0E7F02C26D483E81D6BE5EF9655DD6DEA7D65774BB76CC95456EEC5B5AD62611EEC62B5AFB4261A09AF0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojJsr4kcGAUCMArkC1V/dBKQ== X-DA7885C5: 82117CFD29A248D522358C9D20223E7BD0F8EB7411EFEED539B5EF555FF9FD54D8288D6B1992AB67EF2421ABFA55128DAF83EF9164C44C7E X-Mailru-Sender: 689FA8AB762F7393590D8C940224AE33390AD8AE11342F4A3B7C1BF54CF9D1D20FBE9A32752B8C9C2AA642CC12EC09F1FB559BB5D741EB962F61BD320559CF1EFD657A8799238ED55FEEDEB644C299C0ED14614B50AE0675 X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit 19/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_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