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 AB7CC9DB795; Mon, 29 Jan 2024 13:56:55 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org AB7CC9DB795 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1706525815; bh=23YdZv48u7AgybY9FEDw17mWuGjLa3NQSX66jyh6RIo=; 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=fVV7ZXmEjJh/O7OUVYPVLcDVD+iwognaft8XRRE+apY7wjplrsljUOE0+EMewCSR0 NY8HlgKy+ogJdEl69f1S8sEidpjErp4FcXtOfMcxd+M6fT66Z+Lo7iKoQuK7/k0J3I TfqWbP1dSrqN4te+sqOePp2li7PtqouZzFRZNHdg= 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 1A0639C203B for ; Mon, 29 Jan 2024 13:49:43 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 1A0639C203B Received: by smtp32.i.mail.ru with esmtpa (envelope-from ) id 1rUPCw-0000000BQ6r-1pF6; Mon, 29 Jan 2024 13:49:42 +0300 To: Maxim Kokryashkin , Sergey Bronnikov Date: Mon, 29 Jan 2024 13:45:15 +0300 Message-ID: <762aa9e5928117192f7fc9f1c5df0f6d5f478fbe.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: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD96A58C36AA2E996497FC6886252B15AA40B49C771BBEAAFA9182A05F53808504008161BE32A8DF52E33594132A326AF8B9CDD23456DF780CFDCA4176470581478E9977CD5C7BA570D X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7DB7000F10A5755C8EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637A975286280E7A0BD8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8039F88B71F041914BE1BF1E404F07B8E93F1BC53BE9E3A6CCC7F00164DA146DAFE8445B8C89999728AA50765F7900637DCE3DBD6F8E38AFD389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC821E93C0F2A571C7BF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947CDA7BFA4571439BB26136E347CC761E074AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C360DFB64E4A26F5C4BA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CFE478A468B35FE7671DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C3AA8C68A3574AB3B435872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-C1DE0DAB: 0D63561A33F958A547251DD7E2FBB4265002B1117B3ED6963B60EB9074E648AF7E0012C66AE17B00823CB91A9FED034534781492E4B8EEAD329DC2EF12373DEAC79554A2A72441328621D336A7BC284946AD531847A6065A535571D14F44ED41 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CFD5ED5A3C2C9151FB4D839DD92542DC49445A754C367C2501B72A4479D48AA5C716D5D591715857EC8FB01E7B8BF01A69297B29CA07638F6EB718120DE96C5CC54D7D08EC13B31474C226CC413062362A913E6812662D5F2A5EAB5682573093F7837F15F2B5E4A70B33F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojmd9AG1X07oQA4OqmRMOXfg== X-Mailru-Sender: 11C2EC085EDE56FAC07928AF2646A76951C2A5D746C12F7833594132A326AF8B9CDD23456DF780CFB7CBEF92542CD7C88B0A2698F12F5C9EC77752E0C033A69E86920BD37369036789A8C6A0E60D2BB63A5DB60FBEB33A8A0DA7A0AF5A3A8387 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 luajit 15/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 the `dofile()` (which uses an unreliable relative file path and mutates `_G` with global functions to be defined) to the corresponding `require()`. Also, it adds groups with the names of subtests and enables the test in . Part of tarantool/tarantool#9398 --- test/LuaJIT-tests/lib/ffi/ffi_lex_number.lua | 72 +++++++++++--------- test/LuaJIT-tests/lib/ffi/index | 1 + 2 files changed, 39 insertions(+), 34 deletions(-) diff --git a/test/LuaJIT-tests/lib/ffi/ffi_lex_number.lua b/test/LuaJIT-tests/lib/ffi/ffi_lex_number.lua index e26650ef..ca6c65c5 100644 --- a/test/LuaJIT-tests/lib/ffi/ffi_lex_number.lua +++ b/test/LuaJIT-tests/lib/ffi/ffi_lex_number.lua @@ -1,6 +1,6 @@ local ffi = require("ffi") -dofile("../common/ffi_util.inc") +local checkfail = require("common.ffi.checkfail") local function checklex(t) for i=1,1e9,2 do @@ -14,38 +14,42 @@ local function checklex(t) end end -checklex{ - "0LL", "0ll", - "0LL", "0LL", - "0ULL", "0ull", - "0ULL", "0ULl", - "18446744073709551615ULL", "18446744073709551615llu", - "9223372036854775807LL", "0x7fffffffffffffffll", - "9223372036854775808ULL", "0x8000000000000000ull", - "1311768467463790320LL", "0x123456789abcdef0ll", - "-1LL", "-1ll", - "18446744073709551615ULL", "-1ull", - "-9223372036854775807LL", "-0x7fffffffffffffffll", - "9223372036854775808ULL", "-0x8000000000000000ull", - "0+0i", "0i", - "0+0i", "0I", - "0+12.5i", "12.5i", - "0+4660i", "0x1234i", - "0+infI", "1e400i", - "0-infI", "-1e400i", - "0-12.5i", "-12.5i", - "0-0i", "-0i", -} +do --- checklex + checklex{ + "0LL", "0ll", + "0LL", "0LL", + "0ULL", "0ull", + "0ULL", "0ULl", + "18446744073709551615ULL", "18446744073709551615llu", + "9223372036854775807LL", "0x7fffffffffffffffll", + "9223372036854775808ULL", "0x8000000000000000ull", + "1311768467463790320LL", "0x123456789abcdef0ll", + "-1LL", "-1ll", + "18446744073709551615ULL", "-1ull", + "-9223372036854775807LL", "-0x7fffffffffffffffll", + "9223372036854775808ULL", "-0x8000000000000000ull", + "0+0i", "0i", + "0+0i", "0I", + "0+12.5i", "12.5i", + "0+4660i", "0x1234i", + "0+infI", "1e400i", + "0-infI", "-1e400i", + "0-12.5i", "-12.5i", + "0-0i", "-0i", + } +end -checkfail({ - "0l", - "0lll", - "0u", - "0ul", - "0ulll", - "0wll", - "0xll", - ".0ll", - "0ii", -}, function(s) assert(loadstring("return "..s)) end) +do --- checkfail + checkfail({ + "0l", + "0lll", + "0u", + "0ul", + "0ulll", + "0wll", + "0xll", + ".0ll", + "0ii", + }, function(s) assert(loadstring("return "..s)) end) +end diff --git a/test/LuaJIT-tests/lib/ffi/index b/test/LuaJIT-tests/lib/ffi/index index 71def57b..833c31e3 100644 --- a/test/LuaJIT-tests/lib/ffi/index +++ b/test/LuaJIT-tests/lib/ffi/index @@ -13,6 +13,7 @@ ffi_gcstep_recursive.lua ffi_jit_arith.lua ffi_jit_call.lua ffi_jit_conv.lua +ffi_lex_number.lua istype.lua jit_array.lua jit_complex.lua -- 2.43.0