From: Sergey Kaplun via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Maxim Kokryashkin <m.kokryashkin@tarantool.org>, Sergey Bronnikov <sergeyb@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH luajit 13/36] test: enable <misc/hook_line.lua> LuaJIT test Date: Wed, 14 Aug 2024 16:55:55 +0300 [thread overview] Message-ID: <8d787d4027ef517e72eee6b65765f4eacdf00d89.1723638851.git.skaplun@tarantool.org> (raw) In-Reply-To: <cover.1723638851.git.skaplun@tarantool.org> This patch moves the aforementioned test from the <misc> to the <lang/> directory, includes it in <index>, names the subtests, and adjusts the linenumbers in the assertions to match LuaJIT behaviour and the new code layout. Part of tarantool/tarantool#9398 --- test/LuaJIT-tests/lang/hook_line.lua | 44 ++++++++++++++++++++++++++++ test/LuaJIT-tests/lang/index | 1 + test/LuaJIT-tests/misc/hook_line.lua | 41 -------------------------- 3 files changed, 45 insertions(+), 41 deletions(-) create mode 100644 test/LuaJIT-tests/lang/hook_line.lua delete mode 100644 test/LuaJIT-tests/misc/hook_line.lua diff --git a/test/LuaJIT-tests/lang/hook_line.lua b/test/LuaJIT-tests/lang/hook_line.lua new file mode 100644 index 00000000..bb89c4b8 --- /dev/null +++ b/test/LuaJIT-tests/lang/hook_line.lua @@ -0,0 +1,44 @@ +local lines = {} +local function hook() + lines[#lines + 1] = debug.getinfo(2).currentline +end + +local function dummy() +end -- <-- line 7 + +do --- Base test: cycles, function calls. + debug.sethook(hook, "l", 0) + -- <-- line 11 + local x + dummy() + local y = 1 + dummy() dummy() + local z = 2; local r = true + while y < 4 do y = y + 1 end + while z < 4 do + z = z + 1 + end + -- <-- line 21 + local v + debug.sethook(nil, "", 0) + + assert(#lines > 0) + while lines[1] < 10 do table.remove(lines, 1) end + while lines[#lines] > 20 do table.remove(lines) end + + local s = table.concat(lines, " ") + assert(s == "12 13 7 14 15 7 7 16 17 17 17 17 18 19 18 19 18" or + s == "12 13 7 14 15 7 15 7 16 17 17 17 17 18 19 18 19 18") +end + +do --- Not visited the end of the function definition. + lines = {} + local function f() + if true then return end + local function x() end + end -- <-- line 39 + debug.sethook(hook, "l", 0) + f() + debug.sethook(nil, "", 0) + for i = 1, #lines do assert(lines[i] ~= 39) end +end diff --git a/test/LuaJIT-tests/lang/index b/test/LuaJIT-tests/lang/index index 8cecfa08..ae59bc56 100644 --- a/test/LuaJIT-tests/lang/index +++ b/test/LuaJIT-tests/lang/index @@ -9,6 +9,7 @@ constant dualnum.lua for.lua hook_active.lua +hook_line.lua length.lua lightud.lua modulo.lua diff --git a/test/LuaJIT-tests/misc/hook_line.lua b/test/LuaJIT-tests/misc/hook_line.lua deleted file mode 100644 index 36f71080..00000000 --- a/test/LuaJIT-tests/misc/hook_line.lua +++ /dev/null @@ -1,41 +0,0 @@ -local lines = {} -local function hook() - lines[#lines+1] = debug.getinfo(2).currentline -end - -local function dummy() -end -- <-- line 7 - -debug.sethook(hook, "l", 0) --- <-- line 10 -local x -dummy() -local y = 1 -dummy() dummy() -local z = 2; local r = true -while y < 4 do y = y + 1 end -while z < 4 do - z = z + 1 -end --- <-- line 20 -local v -debug.sethook(nil, "", 0) - -assert(#lines > 0) -while lines[1] < 10 do table.remove(lines, 1) end -while lines[#lines] > 20 do table.remove(lines) end - -local s = table.concat(lines, " ") -assert(s == "11 12 7 13 14 7 7 15 16 16 16 16 17 18 17 18 17" or - s == "11 12 7 13 14 7 14 7 15 16 16 16 16 17 18 17 18 17") - -lines = {} -local function f() - if true then return end - local function x() end -end -- <-- line 36 -debug.sethook(hook, "l", 0) -f() -debug.sethook(nil, "", 0) -for i=1,#lines do assert(lines[i] ~= 36) end - -- 2.45.2
next prev parent reply other threads:[~2024-08-14 14:03 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-08-14 13:55 [Tarantool-patches] [PATCH luajit 00/36] Rearrange LuaJIT misc tests Sergey Kaplun via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 01/36] test: don't run JIT-based LuaJIT tests without JIT Sergey Kaplun via Tarantool-patches 2024-08-15 12:47 ` Sergey Bronnikov via Tarantool-patches 2024-08-19 8:47 ` Sergey Kaplun via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 02/36] test: enable <misc/alias_alloc.lua> LuaJIT test Sergey Kaplun via Tarantool-patches 2024-08-15 12:51 ` Sergey Bronnikov via Tarantool-patches 2024-08-15 13:31 ` Sergey Kaplun via Tarantool-patches 2024-08-30 7:25 ` Sergey Bronnikov via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 03/36] test: refactor <lang/coroutine.lua> " Sergey Kaplun via Tarantool-patches 2024-08-15 13:00 ` Sergey Bronnikov via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 04/36] test: remove <misc/coro_yield.lua> " Sergey Kaplun via Tarantool-patches 2024-08-15 13:05 ` Sergey Bronnikov via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 05/36] test: enable <misc/debug_gc.lua> " Sergey Kaplun via Tarantool-patches 2024-08-15 13:09 ` Sergey Bronnikov via Tarantool-patches 2024-08-15 13:25 ` Sergey Kaplun via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 06/36] test: enable <misc/dualnum.lua> " Sergey Kaplun via Tarantool-patches 2024-08-15 13:11 ` Sergey Bronnikov via Tarantool-patches 2024-08-15 13:19 ` Sergey Bronnikov via Tarantool-patches 2024-08-15 13:22 ` Sergey Kaplun via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 07/36] test: remove <misc/fori_coerce.lua> " Sergey Kaplun via Tarantool-patches 2024-08-15 13:20 ` Sergey Bronnikov via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 08/36] test: remove <misc/fori_dir.lua> " Sergey Kaplun via Tarantool-patches 2024-08-15 13:21 ` Sergey Bronnikov via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 09/36] test: remove <misc/gc_rechain.lua> " Sergey Kaplun via Tarantool-patches 2024-08-15 13:22 ` Sergey Bronnikov via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 10/36] test: enable <misc/gc_trace.lua> " Sergey Kaplun via Tarantool-patches 2024-08-15 13:24 ` Sergey Bronnikov via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 11/36] test: enable <misc/gcstep.lua> " Sergey Kaplun via Tarantool-patches 2024-08-15 13:34 ` Sergey Bronnikov via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 12/36] test: enable <misc/hook_active.lua> " Sergey Kaplun via Tarantool-patches 2024-08-15 13:38 ` Sergey Bronnikov via Tarantool-patches 2024-08-14 13:55 ` Sergey Kaplun via Tarantool-patches [this message] 2024-08-15 13:42 ` [Tarantool-patches] [PATCH luajit 13/36] test: enable <misc/hook_line.lua> " Sergey Bronnikov via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 14/36] test: enable <misc/hook_norecord.lua> " Sergey Kaplun via Tarantool-patches 2024-08-15 13:56 ` Sergey Bronnikov via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 15/36] test: enable <misc/hook_record.lua> " Sergey Kaplun via Tarantool-patches 2024-08-15 13:57 ` Sergey Bronnikov via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 16/36] test: enable <misc/hook_top.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 17/36] test: enable <misc/jit_flush.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 18/36] test: remove <misc/loop_unroll.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 19/36] test: enable <misc/parse_comp.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 20/36] test: enable <misc/parse_esc.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 21/36] test: enable <misc/parse_misc.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 22/36] test: enable <misc/phi_conv.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 23/36] test: enable <misc/recurse_deep.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 24/36] test: remove <misc/recurse_tail.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 25/36] test: enable <misc/stack_gc.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 26/36] test: enable <misc/stack_purge.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 27/36] test: enable <misc/stackov.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 28/36] test: enable <misc/stackovc.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 29/36] test: enable <misc/tcall_base.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 30/36] test: enable <misc/tcall_loop.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 31/36] test: enable <misc/tonumber_scan.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 32/36] test: remove <misc/uclo.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 33/36] test: enable <misc/unordered_jit.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 34/36] test: enable <misc/wbarrier.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 35/36] test: enable <misc/wbarrier_jit.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 36/36] test: enable <misc/wbarrier_obar.lua> " Sergey Kaplun via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=8d787d4027ef517e72eee6b65765f4eacdf00d89.1723638851.git.skaplun@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=m.kokryashkin@tarantool.org \ --cc=sergeyb@tarantool.org \ --cc=skaplun@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH luajit 13/36] test: enable <misc/hook_line.lua> LuaJIT test' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox