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 44D44C1E349; Wed, 14 Aug 2024 17:04:02 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 44D44C1E349 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1723644242; bh=1YQIdP2xa1RwoOcPBakxeIEKWCbxoUfMw+wQG17nxUg=; 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=B0QGmDHoKAGtriNeW1lpUgARW2ZcJwm8bqqa+MzZnQBOiX+chKeZqbGYY0OakVaSw 5qv4pus1wBscDLOna2PFRVHyXRmEfTH0L8wB9cOUVetKZC8ZgooEW/w0QEpmvPB1Yp d9m6JEzWSe791MXpK2B+uK7/2H+WLJ0lpQ4Aipck= 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 347B6C4F423 for ; Wed, 14 Aug 2024 16:56:50 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 347B6C4F423 Received: by smtp45.i.mail.ru with esmtpa (envelope-from ) id 1seEUa-00000003nAF-3wrA; Wed, 14 Aug 2024 16:56:49 +0300 To: Maxim Kokryashkin , Sergey Bronnikov Date: Wed, 14 Aug 2024 16:55:56 +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: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9D7B6E71A78C20FB9A6070491CD29824A55C98F713B74F851182A05F53808504017495D87C837BABBA6D5EE0DB6E1EC8DABD55AD8F7608FDE129B12038A8E527C61CD1C36FF7CC69F X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE745229D52CF30560CEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637C3BF94FB392044A18638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8BAEE0BCF68B989CD92FDB6FC48C14056A2517CF64B3B3ED6CC7F00164DA146DAFE8445B8C89999728AA50765F7900637DCE3DBD6F8E38AFD389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC8C2B5EEE3591E0D35F6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947C643FE6A0CAC512C76136E347CC761E074AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C340CF4A39350C3ECFBA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CF17B107DEF921CE791DD303D21008E298D5E8D9A59859A8B6D082881546D9349175ECD9A6C639B01B78DA827A17800CE73A6989AD488FD87D731C566533BA786AA5CC5B56E945C8DA X-C1DE0DAB: 0D63561A33F958A5075DF57358C0C4435002B1117B3ED6965F834AE6CBC6EBF7B48B7A7F94616420823CB91A9FED034534781492E4B8EEAD2739D626790C8313C79554A2A72441328621D336A7BC284946AD531847A6065A17B107DEF921CE79BDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF1F22490C921C9E1F4AEBC6988013195AF8A6D6434BF6B81824E651EB304A97C7B94BA8791A304480470327EB0AC8E6935C1966D20C7DC3B4E98BAB6BFF30A4789E2A8B40EEB00777C226CC413062362A913E6812662D5F2A5EAB5682573093F7837F15F2B5E4A70B33F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojnMg09N3zL/i2qwZpqkExqg== X-Mailru-Sender: 520A125C2F17F0B1A9638AD358559B59FDEC5A94A2F81EE7A6D5EE0DB6E1EC8DABD55AD8F7608FDEB7CBEF92542CD7C88B0A2698F12F5C9EC77752E0C033A69E86920BD37369036789A8C6A0E60D2BB63A5DB60FBEB33A8A0DA7A0AF5A3A8387 X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit 14/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 subtest. The test is adjusted to be runable in the test suite by adding the `jit.flush()` to avoid collisions of traces. Part of tarantool/tarantool#9398 --- test/LuaJIT-tests/misc/hook_norecord.lua | 12 ------------ test/LuaJIT-tests/trace/hook_norecord.lua | 12 ++++++++++++ test/LuaJIT-tests/trace/index | 1 + 3 files changed, 13 insertions(+), 12 deletions(-) delete mode 100644 test/LuaJIT-tests/misc/hook_norecord.lua create mode 100644 test/LuaJIT-tests/trace/hook_norecord.lua diff --git a/test/LuaJIT-tests/misc/hook_norecord.lua b/test/LuaJIT-tests/misc/hook_norecord.lua deleted file mode 100644 index 8e7cba05..00000000 --- a/test/LuaJIT-tests/misc/hook_norecord.lua +++ /dev/null @@ -1,12 +0,0 @@ - -if not jit or not jit.status or not jit.status() then return end - -local called = false -local function f() local x = "wrong"; called = true end -jit.off(f) -debug.sethook(f, "", 5) -for i=1,1000 do local a,b,c,d,e,f=1,2,3,4,5,6 end -assert(called) --- Check that no trace was generated. -assert(require("jit.util").traceinfo(1) == nil) - diff --git a/test/LuaJIT-tests/trace/hook_norecord.lua b/test/LuaJIT-tests/trace/hook_norecord.lua new file mode 100644 index 00000000..4c39bade --- /dev/null +++ b/test/LuaJIT-tests/trace/hook_norecord.lua @@ -0,0 +1,12 @@ +do --- Abort trace recording on any hook call. + local called = false + local function f() local x = "wrong"; called = true end + jit.off(f) + jit.flush() + debug.sethook(f, "", 5) + for _ = 1, 1000 do local a, b, c, d, e, f = 1, 2, 3, 4, 5, 6 end + assert(called) + -- Check that no trace was generated. + assert(require("jit.util").traceinfo(1) == nil) + debug.sethook() +end diff --git a/test/LuaJIT-tests/trace/index b/test/LuaJIT-tests/trace/index index 46c8f5d2..595a71d2 100644 --- a/test/LuaJIT-tests/trace/index +++ b/test/LuaJIT-tests/trace/index @@ -3,6 +3,7 @@ exit_growstack.lua exit_jfuncf.lua gc.lua gc64_slot_revival.lua +hook_norecord.lua phi snap.lua stitch.lua -- 2.45.2