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 40854C6DDAD; Wed, 21 Aug 2024 12:07:00 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 40854C6DDAD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1724231220; bh=jqKig7cjxR2jD16tDtMPHL9wAeXbUuIkPxBX3w+S3eo=; 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=Rs37nh9MQyw7jzwRh9w4sb6t9FtvuFFkiNyv6A2Vub6kfBhdbvZqmmilGVsE+2UAG D0QL0kUlR/jsaxKsmJe1lZHIOxnz38VCCMzGpMdfVHa/mQMHpi8PnIzefsRGCHkdLv Xsq+0lRUiTyT6oHsZgoKn8cOifeH6Mc9Gl9HcwTE= Received: from smtp35.i.mail.ru (smtp35.i.mail.ru [95.163.41.76]) (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 67B46C6198B for ; Wed, 21 Aug 2024 11:59:19 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 67B46C6198B Received: by smtp35.i.mail.ru with esmtpa (envelope-from ) id 1sghBW-00000005aRz-17eP; Wed, 21 Aug 2024 11:59:18 +0300 To: Maxim Kokryashkin , Sergey Bronnikov Date: Wed, 21 Aug 2024 11:58:19 +0300 Message-ID: <2e6f291e381ee18f9dd968d70631a56bad510a14.1724228998.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: 4F1203BC0FB41BD93D5A650E6D4F687E939B7AB30B7B6DDAE3559D94643A1A87182A05F53808504082E432AF7E105FA4D27678DDAA806314F70A774D71624B5BEFF80BD07D1CDB79083B9DBA0D511FCC X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7F65C230EDDCD559EEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006373513C06CCDD4732A8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8278E2C75A73FFDF4C1F3096FD6B0A5BA0B960864F9A7706FCC7F00164DA146DAFE8445B8C89999728AA50765F7900637BA939FD1B3BAB99B389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC878444BBB7636F62AF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA7E827F84554CEF5019E625A9149C048EE9ECD01F8117BC8BEE2021AF6380DFAD18AA50765F790063735872C767BF85DA227C277FBC8AE2E8B80B9CEB5436E71E375ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-C1DE0DAB: 0D63561A33F958A5C4355EEA1EB482E45002B1117B3ED696A46F61563A77D4C122DFD5397F446790823CB91A9FED034534781492E4B8EEADABF80F987DAEDACBC79554A2A72441328621D336A7BC284946AD531847A6065A535571D14F44ED41 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF96C949AA54A2409610E2997182952A7CB9FD296688C04FFF0CAED713F637D0018135B9CF208C7BB7D14E51FF79EEE60338AC7711E4689168B2A94BCD9D7316CEE3352DEDE2B56456C226CC413062362A913E6812662D5F2A5EAB5682573093F7837F15F2B5E4A70B33F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojegttVMu7AX/Ya+VwNc5bKg== X-DA7885C5: E22CBCE873B99DF2F255D290C0D534F9FBECA23D2C101A0675E80D52F0117B7C83D5FA71E1817E545B1A4C17EAA7BC4BEF2421ABFA55128DAF83EF9164C44C7E X-Mailru-Sender: 689FA8AB762F7393C6D0B12EA33CAA9B23E789413FA73F22DAC77899D9C4377F6626783249B3A618E49D44BB4BD9522A059A1ED8796F048DB274557F927329BE89D5A3BC2B10C37545BD1C3CC395C826B4A721A3011E896F X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 luajit 16/45] 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 , names the subtests, and slightly reformates the code style to make it closer to ours. 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..a5f38055 --- /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