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 4C4E4C13AD2; Wed, 14 Aug 2024 16:59:31 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 4C4E4C13AD2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1723643971; bh=h08L83NaonkJMM5l+4XJL2hEpDE64kyn1f4I1RHPOQ4=; 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=pUU8/n68u3UrOgOGmblCB9v4woZ9dZhO+KviuNtVtYyGRwAcC+Lcpn7YeAxXFwF7o h79ipRPOvmSvVapz5Se9I8YBkeC/8d7REHPYgZ2igoVbd8rM/znplba5wYG2oN7N93 1aPlMTtdnxRVOgelA66yCHapaHgJ+BR3loFgSEiQ= Received: from smtp45.i.mail.ru (smtp45.i.mail.ru [95.163.41.83]) (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 7FB19C4F41B for ; Wed, 14 Aug 2024 16:56:33 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 7FB19C4F41B Received: by smtp45.i.mail.ru with esmtpa (envelope-from ) id 1seEUK-00000003nAF-1ck6; Wed, 14 Aug 2024 16:56:32 +0300 To: Maxim Kokryashkin , Sergey Bronnikov Date: Wed, 14 Aug 2024 16:55:47 +0300 Message-ID: <5913e9693652ea13ca55be9de17697144df81749.1723638851.git.skaplun@tarantool.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9D7B6E71A78C20FB9B3BE019D3A342608F4B1CCAC282AF57C182A05F53808504017635D87C837BABBA6D5EE0DB6E1EC8D46AC5CA7DC750985129B12038A8E527CD5DA017CF5BD799E X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE75B37E0A1C175363BEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637F10F1F3256FD32E28638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D80AEBB5A49278D1A892FDB6FC48C140568DCA3B6614B5F687CC7F00164DA146DAFE8445B8C89999728AA50765F79006372A3B24BF85B2E607389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC80CABCCA60F52D7EBF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947CB2DECCBDF547A30576E601842F6C81A12EF20D2F80756B5FB606B96278B59C4276E601842F6C81A127C277FBC8AE2E8B120C23C05AEC2B18EC76A7562686271ED91E3A1F190DE8FD2E808ACE2090B5E14AD6D5ED66289B5259CC434672EE63711DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C3A1C30C8AFC676C8B35872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-C1DE0DAB: 0D63561A33F958A595A75E8A35D93E6C5002B1117B3ED696D68D4A35B0A518D07E0012C66AE17B00823CB91A9FED034534781492E4B8EEAD21D4E6D365FE45D1C79554A2A72441328621D336A7BC284946AD531847A6065A535571D14F44ED41 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF84337668D467AC7F34B215B7703E5247309863649B39BBAC81036DD01C74FD1D6BD4E2D2DF3D4047470327EB0AC8E693BE748587FAEC6A2DE98BAB6BFF30A4786FEA4199730DD158C226CC413062362A913E6812662D5F2A5EAB5682573093F7837F15F2B5E4A70B33F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojnMg09N3zL/jXpMWgWVc2tw== X-Mailru-Sender: 520A125C2F17F0B1A9638AD358559B591E3C8E0AA6FEF1CFA6D5EE0DB6E1EC8D46AC5CA7DC750985B7CBEF92542CD7C88B0A2698F12F5C9EC77752E0C033A69E86920BD37369036789A8C6A0E60D2BB63A5DB60FBEB33A8A0DA7A0AF5A3A8387 X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit 05/36] 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 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 moves the aforementioned test from the to the directory (with slightly renaming to be consistent with other names), includes it in , and names the subtest. Also, it changes the number of iterations to trigger the GC since the number of objects is different when running the test as a part of the LuaJIT test suite. Part of tarantool/tarantool#9398 --- .../{misc/debug_gc.lua => lang/gc_debug.lua} | 31 ++++++++++++------- test/LuaJIT-tests/lang/index | 1 + 2 files changed, 20 insertions(+), 12 deletions(-) rename test/LuaJIT-tests/{misc/debug_gc.lua => lang/gc_debug.lua} (63%) diff --git a/test/LuaJIT-tests/misc/debug_gc.lua b/test/LuaJIT-tests/lang/gc_debug.lua similarity index 63% rename from test/LuaJIT-tests/misc/debug_gc.lua rename to test/LuaJIT-tests/lang/gc_debug.lua index 30fb2b99..bb30adc1 100644 --- a/test/LuaJIT-tests/misc/debug_gc.lua +++ b/test/LuaJIT-tests/lang/gc_debug.lua @@ -1,12 +1,7 @@ - --- Do not run this test unless the JIT compiler is turned off. -if jit and jit.status and jit.status() then return end - local caught, caught_line, caught_mm local function gcmeta() if caught ~= "end" then --- print(debug.traceback()) -- This may point to the wrong instruction if in a JIT trace. -- But there's no guarantee if, when or where any GC steps occur. local dbg = debug.getinfo(2) @@ -22,7 +17,7 @@ local function testgc(mm, f) local u = newproxy(true) getmetatable(u).__gc = gcmeta u = nil - for i=1,100000 do + for i = 1, 1e7 do f(i) -- This check may be hoisted. __gc is not supposed to have side-effects. if caught then break end @@ -38,10 +33,22 @@ local function testgc(mm, f) end end -local x -testgc("__gc", function(i) x = {} end) -testgc("__gc", function(i) x = {1} end) -testgc("__gc", function(i) x = function() end end) -testgc("__concat", function(i) x = i.."" end) +do --- Test __gc metamethod info + -- Do not run this test unless the JIT compiler is turned off. + local jit_need_restore = false + if jit and jit.status and jit.status() then + jit_need_restore = true + jit.off() + end + + local x + testgc("__gc", function(i) x = {} end) + testgc("__gc", function(i) x = {1} end) + testgc("__gc", function(i) x = function() end end) + testgc("__concat", function(i) x = i.."" end) -caught = "end" + caught = "end" + if jit_need_restore then + jit.on() + end +end diff --git a/test/LuaJIT-tests/lang/index b/test/LuaJIT-tests/lang/index index 803f32d8..4d9feafd 100644 --- a/test/LuaJIT-tests/lang/index +++ b/test/LuaJIT-tests/lang/index @@ -17,5 +17,6 @@ upvalue tail_recursion.lua vararg_jit.lua gc.lua +gc_debug.lua goto.lua +goto meta -- 2.45.2