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 6484C9CBDFB; Mon, 5 Feb 2024 16:32:48 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 6484C9CBDFB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1707139968; bh=/VFHAk3xHdiOQp4bUDzAQmTHRzjOuPKtcqsHIztJyGs=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=rEvNhCwAZ/xBZhF6e0xk4eBOedcy0J8Phsnjzwx0HKfBEdCsfC4la/eu8tMEF5lep U8cv90NXT//pZudt3Bqs3k1v5TMQZHP7OElDeVdiCLOs9BlkIhbfvUyUqsrbbFZxtg aIxEm4PID+FNcr2UiajuWHLgNMzLsVNYsRnBXJTY= Received: from smtp48.i.mail.ru (smtp48.i.mail.ru [95.163.41.86]) (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 55E9B9CBDF1 for ; Mon, 5 Feb 2024 16:32:47 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 55E9B9CBDF1 Received: by smtp48.i.mail.ru with esmtpa (envelope-from ) id 1rWz5a-00000008WL2-03zW; Mon, 05 Feb 2024 16:32:46 +0300 Message-ID: <9301ebd7-29e8-42a7-804f-8b7f15a0105a@tarantool.org> Date: Mon, 5 Feb 2024 16:32:45 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Sergey Kaplun , Maxim Kokryashkin Cc: tarantool-patches@dev.tarantool.org References: <468ff041c9e3144f534a5fa1a21420a1e27719c8.1706520765.git.skaplun@tarantool.org> In-Reply-To: <468ff041c9e3144f534a5fa1a21420a1e27719c8.1706520765.git.skaplun@tarantool.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD94C460F083DF69F5190553CFE4D3947DFAEC6AB1FF362D218182A05F5380850405FF2387E49392366C7A4B249DE6549FDAA4241E0722ECDCD92DBA345DE3DAF6C4A3B2B2F2A2306C8 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7FE853634EDEBEC2EEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006375E5376F82D9E62E48638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D80785DD460274B1AE8606D082CBC14EBB7F81A7CC4B8680B9CC7F00164DA146DAFE8445B8C89999728AA50765F7900637D0FEED2715E18529389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC81D471462564A2E19F6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947C632EDEA9CD5989A36136E347CC761E074AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C3CF39425AD3EEC986BA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CFE478A468B35FE7671DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C31BC2FD6A5287AC5335872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-C1DE0DAB: 0D63561A33F958A51D3AC2F388807DDE5002B1117B3ED696BF31A7C58F81F8EC1A1B8FE1FED62FE8823CB91A9FED034534781492E4B8EEAD2609375A3A81E2DDBDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF1DC69F0CE007DB986B6DE0F32FD50BB0F29C966664A73CBCF087F2E6D9C7B943B0F06D2F9487D0FC14BC176DD269F15E23C125B490FFD8B4BC6F114E0A517B171B8249581EB602AC5F4332CA8FE04980913E6812662D5F2AB9AF64DB4688768036DF5FE9C0001AF333F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj0TrRSEWQ3VnLdDawjnqrXg== X-Mailru-Sender: 11C2EC085EDE56FAC07928AF2646A76988E542B851700248C7A4B249DE6549FDAA4241E0722ECDCDB7CBEF92542CD7C8795FA72BAB74744FC77752E0C033A69EA16A481184E8BB1C9B38E6EA4F046BE03A5DB60FBEB33A8A0DA7A0AF5A3A8387 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v2 luajit 26/26] test: enable LuaJIT test 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 Bronnikov via Tarantool-patches Reply-To: Sergey Bronnikov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi, Sergey thanks for the patch! LGTM On 1/29/24 13:45, Sergey Kaplun wrote: > This patch moves the test from the to > directory, includes it in , and names subtests. > > Resolves of tarantool/tarantool#7834 > Part of tarantool/tarantool#9398 > --- > .../{sysdep => lang}/catch_cpp.lua | 36 ++++++++++--------- > test/LuaJIT-tests/lang/index | 1 + > 2 files changed, 20 insertions(+), 17 deletions(-) > rename test/LuaJIT-tests/{sysdep => lang}/catch_cpp.lua (75%) > > diff --git a/test/LuaJIT-tests/sysdep/catch_cpp.lua b/test/LuaJIT-tests/lang/catch_cpp.lua > similarity index 75% > rename from test/LuaJIT-tests/sysdep/catch_cpp.lua > rename to test/LuaJIT-tests/lang/catch_cpp.lua > index b2251009..6c52c78c 100644 > --- a/test/LuaJIT-tests/sysdep/catch_cpp.lua > +++ b/test/LuaJIT-tests/lang/catch_cpp.lua > @@ -1,30 +1,30 @@ > +local cp = require("libcpptest") > > -local cp = require("cpptest") > +local unwind > > -do > +do --- catch, no error > local a, b = pcall(cp.catch, function() return "x" end) > assert(a == true and b == "x") > end > > -do > +do --- pcall throw > local a, b = pcall(function() cp.throw("foo") end) > assert(a == false and b == "C++ exception") > end > > -local unwind > -do > +do --- catch throw > local a, b = pcall(cp.catch, function() cp.throw("foo") end) > unwind = a > assert((a == false and b == "C++ exception") or (a == true and b == "foo")) > end > > -do > +do --- alloc, no error > local st = cp.alloc(function() return cp.isalloc() end) > assert(st == true) > assert(cp.isalloc() == false) > end > > -do > +do --- throw in alloc > local a, b = pcall(cp.alloc, function() > assert(cp.isalloc() == true) > return "foo", cp.throw > @@ -33,21 +33,23 @@ do > assert(cp.isalloc() == false) > end > > -if unwind then > - local a, b = pcall(cp.alloc, function() > - assert(cp.isalloc() == true) > - return "foo", error > - end) > - assert(a == false and b == "foo") > - assert(cp.isalloc() == false) > +do --- error in alloc > + if unwind then > + local a, b = pcall(cp.alloc, function() > + assert(cp.isalloc() == true) > + return "foo", error > + end) > + assert(a == false and b == "foo") > + assert(cp.isalloc() == false) > + end > end > > -do > +do --- usereg nop > local a,b,c,d,e,f = cp.usereg(100, 50, function() end, false) > assert(a==164 and b==312 and c==428 and d==3696 and e==404 and f==404) > end > > -do > +do --- usereg error > local function test() > cp.usereg(100, 40, error, "foo") > end > @@ -55,7 +57,7 @@ do > assert(a==164 and b==312 and c==428 and d==3696 and e==404 and f==404) > end > > -do > +do --- usereg trace with self table lookup > local t = {}; > t.t = t; > local function foo() > diff --git a/test/LuaJIT-tests/lang/index b/test/LuaJIT-tests/lang/index > index 87b0c5a0..41f7e7db 100644 > --- a/test/LuaJIT-tests/lang/index > +++ b/test/LuaJIT-tests/lang/index > @@ -1,6 +1,7 @@ > andor.lua > api_call.lua > assignment.lua > +catch_cpp.lua > catch_wrap.lua > compare.lua > compare_nan.lua