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 AA759C74DD6; Wed, 21 Aug 2024 12:09:01 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org AA759C74DD6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1724231341; bh=8hBYDb0J/HqwvCftQxvqfeCMN6f0uinkx+b2iC0COGw=; 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=kRHUuVSw8Iy0XE89u6gMY4Fj8v0ZhUGigJOzXC/G9sKC9mj8aBdPGDpqX4XC6dVUq WM9csjoBV19mASNcA5Ia/jyt3szeLEcv1ZhCsBlO2xz53nud3A9cmdgGb4E7za0anx tsVgCmj6Qq9b5z/kNhd1F3B0n0aJMQ/AcKh5h5Ok= 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 F01C9C61990 for ; Wed, 21 Aug 2024 11:59:28 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org F01C9C61990 Received: by smtp35.i.mail.ru with esmtpa (envelope-from ) id 1sghBg-00000005aRz-0Kso; Wed, 21 Aug 2024 11:59:28 +0300 To: Maxim Kokryashkin , Sergey Bronnikov Date: Wed, 21 Aug 2024 11:58:23 +0300 Message-ID: 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: 4F1203BC0FB41BD93D5A650E6D4F687E1390477390DEF6A31556D71BE57BEFCC182A05F538085040C4327DC0A2BF47B8D27678DDAA806314AC46431A68FF86C5EFF80BD07D1CDB792D8445145E24918E X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE779AAD18609327F83EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006375045C080FAAE96148638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D846B66C457448A66AC1F3096FD6B0A5BA81C6F011376A4C97CC7F00164DA146DAFE8445B8C89999728AA50765F7900637D0FEED2715E18529389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC821E93C0F2A571C7BF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA7E827F84554CEF5019E625A9149C048EE9ECD01F8117BC8BEE2021AF6380DFAD18AA50765F790063735872C767BF85DA227C277FBC8AE2E8B80B9CEB5436E71E375ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-C1DE0DAB: 0D63561A33F958A52BF005CE6207B0F05002B1117B3ED6960AF189C333C5B5B49E040399BDE4761E823CB91A9FED034534781492E4B8EEAD3B90412627F530F9A71A35648BE338CE9510FB958DCE06DB58C12E6D310A6D53A16EC4B4EECACEB3 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF24BC7CF74C78C15F890D819BD3C4ED2F6608E72DCA16F65B5C9E79E4152DFC5FBF40353A1B84A450D14E51FF79EEE603A35637E38376D23DB2A94BCD9D7316CEAC65C1FE8FC8BD5AC226CC413062362A913E6812662D5F2A5EAB5682573093F7837F15F2B5E4A70B33F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojegttVMu7AX9yb/wIvxxzCA== X-DA7885C5: 11291F2C11AC9630F255D290C0D534F9489B61ECB9BC2B0F8363178BD12AA215445EDD339991167D5B1A4C17EAA7BC4BEF2421ABFA55128DAF83EF9164C44C7E X-Mailru-Sender: 689FA8AB762F7393C6D0B12EA33CAA9B6B6E54BF5AA0CF46DAC77899D9C4377FA8C511307952E5B4E49D44BB4BD9522A059A1ED8796F048DB274557F927329BE89D5A3BC2B10C37545BD1C3CC395C826B4A721A3011E896F X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 luajit 20/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 , and names the subtests. Part of tarantool/tarantool#9398 --- test/LuaJIT-tests/lang/hook_top.lua | 59 +++++++++++++++++++++++++++++ test/LuaJIT-tests/lang/index | 1 + test/LuaJIT-tests/misc/hook_top.lua | 55 --------------------------- 3 files changed, 60 insertions(+), 55 deletions(-) create mode 100644 test/LuaJIT-tests/lang/hook_top.lua delete mode 100644 test/LuaJIT-tests/misc/hook_top.lua diff --git a/test/LuaJIT-tests/lang/hook_top.lua b/test/LuaJIT-tests/lang/hook_top.lua new file mode 100644 index 00000000..4cab2559 --- /dev/null +++ b/test/LuaJIT-tests/lang/hook_top.lua @@ -0,0 +1,59 @@ +local t = {} +for i = 1, 26 do t[i] = string.char(96 + i) end + +local function tcheck(t1, t2) + assert(#t1 == #t2) + for i = 1, #t1 do assert(t1[i] == t2[i]) end +end + +local function foo1(...) -- VARG RETM + return ... +end + +local function foo2(...) -- VARG UCLO RETM + local function dummy() end + return ... +end + +local function foo3(...) -- VARG UCLO -> RETM + do return ... end + local function dummy() end +end + +local function foo4() -- UCLO UCLO RET + do + local x + local function dummy() return x end + end +end + +local function foo5(a) + assert(a == "bar") +end + +do --- Run hook on each bytecode instruction. + local called = false + debug.sethook(function() local x = "wrong"; called = true end, "", 1) + tcheck(t, {foo1(unpack(t))}) -- CALLM TSETM + assert(called) + called = false + tcheck(t, {foo2(unpack(t))}) + assert(called) + called = false + tcheck(t, {foo3(unpack(t))}) + assert(called) + called = false + foo4() + assert(called) + debug.sethook(nil) +end + +do --- Set local variable given to a function inside the hook. + debug.sethook(function() + local name, val = debug.getlocal(2, 1) + assert(name == "a" and val == nil) + debug.setlocal(2, 1, "bar") + debug.sethook(nil) + end, "c") + foo5() +end diff --git a/test/LuaJIT-tests/lang/index b/test/LuaJIT-tests/lang/index index ae59bc56..327b40fe 100644 --- a/test/LuaJIT-tests/lang/index +++ b/test/LuaJIT-tests/lang/index @@ -10,6 +10,7 @@ dualnum.lua for.lua hook_active.lua hook_line.lua +hook_top.lua length.lua lightud.lua modulo.lua diff --git a/test/LuaJIT-tests/misc/hook_top.lua b/test/LuaJIT-tests/misc/hook_top.lua deleted file mode 100644 index f809fcea..00000000 --- a/test/LuaJIT-tests/misc/hook_top.lua +++ /dev/null @@ -1,55 +0,0 @@ - -local t = {} -for i=1,26 do t[i] = string.char(96+i) end - -local function tcheck(t1, t2) - assert(#t1 == #t2) - for i=1,#t1 do assert(t1[i] == t2[i]) end -end - -local function foo1(...) -- VARG RETM - return ... -end - -local function foo2(...) -- VARG UCLO RETM - local function dummy() end - return ... -end - -local function foo3(...) -- VARG UCLO -> RETM - do return ... end - local function dummy() end -end - -local function foo4() -- UCLO UCLO RET - do - local x - local function dummy() return x end - end -end - -called = false -debug.sethook(function() local x = "wrong"; called = true end, "", 1) -tcheck(t, {foo1(unpack(t))}) -- CALLM TSETM -assert(called) -called = false -tcheck(t, {foo2(unpack(t))}) -assert(called) -called = false -tcheck(t, {foo2(unpack(t))}) -assert(called) -called = false -foo4() -assert(called) - -debug.sethook(function() - local name, val = debug.getlocal(2, 1) - assert(name == "a" and val == nil) - debug.setlocal(2, 1, "bar") - debug.sethook(nil) -end, "c") -local function foo5(a) - assert(a == "bar") -end -foo5() - -- 2.45.2