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 7F021C13AEB; Wed, 14 Aug 2024 17:03:02 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 7F021C13AEB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1723644182; bh=LsYCQPPAp3IuBkb27nGs2yJVM7rBCj5JK3iEJY6Gl/8=; 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=qPkU+teZoB00EmZx94QGsv0PQrAJb08TryPGn3OaHfBcmzUQ3ftUs4vFMKSbhsilv rsSsrATekVT6ceCNzYdfMcnxN0cmypCevPRdvsNZS8LJTOcW7cRH2ouWgs2UdixOUS sUrD37i/E5ocxK/jSiTfBAb7ffA6WcdaIiJ9xwDg= 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 DAAB2C4F422 for ; Wed, 14 Aug 2024 16:56:45 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org DAAB2C4F422 Received: by smtp45.i.mail.ru with esmtpa (envelope-from ) id 1seEUW-00000003nAF-2GoR; Wed, 14 Aug 2024 16:56:44 +0300 To: Maxim Kokryashkin , Sergey Bronnikov Date: Wed, 14 Aug 2024 16:55:54 +0300 Message-ID: <39c68575a9675fac95f52bc2fc66253f1ede25e0.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: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD9D7B6E71A78C20FB96B382944D737B485278D98DAE9CD6B8D182A05F538085040177F5D87C837BABBA6D5EE0DB6E1EC8D65EAD3624AF43074129B12038A8E527C906DE0852CB23BE4 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7BC08626EA5717D14EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637C0EA1E34B58229798638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8E2FC5C4C09FD4DCD92FDB6FC48C14056EDA078BF37B15249CC7F00164DA146DAFE8445B8C89999728AA50765F790063741F7343E26298569389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC886A7C529F68B8E5CF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947CDA532D2019E286A76136E347CC761E074AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C3015E3C4E802C7FF8BA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CF17B107DEF921CE791DD303D21008E298D5E8D9A59859A8B6D082881546D9349175ECD9A6C639B01B78DA827A17800CE7888FFA144A8AE6D0731C566533BA786AA5CC5B56E945C8DA X-C1DE0DAB: 0D63561A33F958A5B80949DD00386C5E5002B1117B3ED6968A0930E83C26904ABFF4097FFC9E796F823CB91A9FED034534781492E4B8EEADA757276DBF662F3EC79554A2A72441328621D336A7BC284946AD531847A6065A535571D14F44ED41 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF34A81F6DC4FB0C3FA35969E72B53D1351F06B6108B7D20D15CE983873E914264A161E968D9DBB349470327EB0AC8E69335DB457299745F00E98BAB6BFF30A478BF0543BE09F11CF0C226CC413062362A913E6812662D5F2A5EAB5682573093F7837F15F2B5E4A70B33F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojnMg09N3zL/jWpWkGFAk8jw== X-Mailru-Sender: 520A125C2F17F0B1A9638AD358559B59202CC0C039D42722A6D5EE0DB6E1EC8D65EAD3624AF43074B7CBEF92542CD7C88B0A2698F12F5C9EC77752E0C033A69E86920BD37369036789A8C6A0E60D2BB63A5DB60FBEB33A8A0DA7A0AF5A3A8387 X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit 12/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, includes it in , and names the subtests. Part of tarantool/tarantool#9398 --- test/LuaJIT-tests/lang/hook_active.lua | 102 +++++++++++++++++++++++++ test/LuaJIT-tests/lang/index | 1 + test/LuaJIT-tests/misc/hook_active.lua | 95 ----------------------- 3 files changed, 103 insertions(+), 95 deletions(-) create mode 100644 test/LuaJIT-tests/lang/hook_active.lua delete mode 100644 test/LuaJIT-tests/misc/hook_active.lua diff --git a/test/LuaJIT-tests/lang/hook_active.lua b/test/LuaJIT-tests/lang/hook_active.lua new file mode 100644 index 00000000..c82670f5 --- /dev/null +++ b/test/LuaJIT-tests/lang/hook_active.lua @@ -0,0 +1,102 @@ +local ctest = require("libctest") + +local called = 0 +local function clearhook() debug.sethook(nil, "", 0) end + +do --- Return from pcall with active hook must prepend true. FF pcall. + called = 0 + debug.sethook(function() called=called+1; assert(pcall(function() end) == true); clearhook() end, "", 1) + do local x = 1 end + assert(called == 1) +end + +do --- Hook with special caught error must not unblock hooks. FF pcall. + called = 0 + debug.sethook(function() called=called+1; pcall(nil); clearhook() end, "", 1) + do local x = 1 end + assert(called == 1) +end + +do --- Hook with caught error must not unblock hooks. FF pcall. + called = 0 + local function p2() error("") end + debug.sethook(function() called=called+1; pcall(p2); clearhook() end, "", 1) + do local x = 1 end + assert(called == 1) +end + +do --- Hook with special caught error must not unblock hooks. C pcall. + called = 0 + debug.sethook(function() called=called+1; ctest.pcall(nil); clearhook() end, "", 1) + do local x = 1 end + assert(called == 1) +end + +do --- Hook with caught error must not unblock hooks. C pcall + called = 0 + local function p2() error("") end + debug.sethook(function() called=called+1; ctest.pcall(p2); clearhook() end, "", 1) + do local x = 1 end + assert(called == 1) +end + +do --- Regular pcall must not block hooks. + debug.sethook(function() called=called+1 end, "", 1) + pcall(function() end) + called = 0 + do local x = 1 end + assert(called > 0) + pcall(function() error("") end) + called = 0 + do local x = 1 end + assert(called > 0) + ctest.pcall(function() end) + called = 0 + do local x = 1 end + assert(called > 0) + ctest.pcall(function() error("") end) + called = 0 + do local x = 1 end + assert(called > 0) + clearhook() +end + +do --- Hook with uncaught error must unblock hooks. FF pcall + called = 0 + pcall(function() + debug.sethook(function() + local old = called + called = 1 + if old == 0 then error("") end + end, "", 1) + do local x = 1 end + end) + assert(called == 1) + called = 2 + do local x = 1 end + assert(called == 1, "hook not unblocked after uncaught error") + clearhook() + called = 2 + do local x = 1 end + assert(called == 2) +end + +do --- Hook with uncaught error must unblock hooks. C pcall + called = 0 + ctest.pcall(function() + debug.sethook(function() + local old = called + called = 1 + if old == 0 then error("") end + end, "", 1) + do local x = 1 end + end) + assert(called == 1) + called = 2 + do local x = 1 end + assert(called == 1, "hook not unblocked after uncaught error") + clearhook() + called = 2 + do local x = 1 end + assert(called == 2) +end diff --git a/test/LuaJIT-tests/lang/index b/test/LuaJIT-tests/lang/index index 274425bf..8cecfa08 100644 --- a/test/LuaJIT-tests/lang/index +++ b/test/LuaJIT-tests/lang/index @@ -8,6 +8,7 @@ compare_nan.lua constant dualnum.lua for.lua +hook_active.lua length.lua lightud.lua modulo.lua diff --git a/test/LuaJIT-tests/misc/hook_active.lua b/test/LuaJIT-tests/misc/hook_active.lua deleted file mode 100644 index 37dfc379..00000000 --- a/test/LuaJIT-tests/misc/hook_active.lua +++ /dev/null @@ -1,95 +0,0 @@ -local ctest = require("ctest") - -local called = 0 -local function clearhook() debug.sethook(nil, "", 0) end - --- Return from pcall with active hook must prepend true. FF pcall. -called = 0 -debug.sethook(function() called=called+1; assert(pcall(function() end) == true); clearhook() end, "", 1) -do local x = 1 end -assert(called == 1) - --- Hook with special caught error must not unblock hooks. FF pcall. -called = 0 -debug.sethook(function() called=called+1; pcall(nil); clearhook() end, "", 1) -do local x = 1 end -assert(called == 1) - --- Hook with caught error must not unblock hooks. FF pcall. -called = 0 -local function p2() error("") end -debug.sethook(function() called=called+1; pcall(p2); clearhook() end, "", 1) -do local x = 1 end -assert(called == 1) - --- Hook with special caught error must not unblock hooks. C pcall. -called = 0 -debug.sethook(function() called=called+1; ctest.pcall(nil); clearhook() end, "", 1) -do local x = 1 end -assert(called == 1) - --- Hook with caught error must not unblock hooks. C pcall -called = 0 -local function p2() error("") end -debug.sethook(function() called=called+1; ctest.pcall(p2); clearhook() end, "", 1) -do local x = 1 end -assert(called == 1) - --- Regular pcall must not block hooks. -debug.sethook(function() called=called+1 end, "", 1) -pcall(function() end) -called = 0 -do local x = 1 end -assert(called > 0) -pcall(function() error("") end) -called = 0 -do local x = 1 end -assert(called > 0) -ctest.pcall(function() end) -called = 0 -do local x = 1 end -assert(called > 0) -ctest.pcall(function() error("") end) -called = 0 -do local x = 1 end -assert(called > 0) -clearhook() - --- Hook with uncaught error must unblock hooks. FF pcall -called = 0 -pcall(function() - debug.sethook(function() - local old = called - called = 1 - if old == 0 then error("") end - end, "", 1) - do local x = 1 end -end) -assert(called == 1) -called = 2 -do local x = 1 end -assert(called == 1, "hook not unblocked after uncaught error") -clearhook() -called = 2 -do local x = 1 end -assert(called == 2) - --- Hook with uncaught error must unblock hooks. C pcall -called = 0 -ctest.pcall(function() - debug.sethook(function() - local old = called - called = 1 - if old == 0 then error("") end - end, "", 1) - do local x = 1 end -end) -assert(called == 1) -called = 2 -do local x = 1 end -assert(called == 1, "hook not unblocked after uncaught error") -clearhook() -called = 2 -do local x = 1 end -assert(called == 2) - -- 2.45.2