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 BB799C75CEF; Thu, 15 Aug 2024 16:01:00 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org BB799C75CEF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1723726860; bh=/riND4H9514Wr6XYRkGjL5gwXJ0DogZnCheqd4dEw+k=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=PGBg6dEUV6k6e2D1hXEWwHOScnbYyzlKLUHuTblbqpdEOWuTsWrJk6Ju8mi0MhReW uJd6q8rxlJpijvmagGLDdv1fq4U+LHyck0hHapnglvUM0ACFiftGXXSwAVCYKBNI/W Ngd/Ud8dZB95Riq/Hf5mU8FnbyTrY08vgADEkfFM= Received: from smtp59.i.mail.ru (smtp59.i.mail.ru [95.163.41.97]) (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 18BB3C75CEE for ; Thu, 15 Aug 2024 16:01:00 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 18BB3C75CEE Received: by smtp59.i.mail.ru with esmtpa (envelope-from ) id 1sea66-00000008aQ0-2aFu; Thu, 15 Aug 2024 16:00:59 +0300 Content-Type: multipart/alternative; boundary="------------gzPa60q1XNw3aVQRtOkYy8Wy" Message-ID: Date: Thu, 15 Aug 2024 16:00:58 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Sergey Kaplun , Maxim Kokryashkin Cc: tarantool-patches@dev.tarantool.org References: <8e9e2481942c2c98a1e7f078e71b29edab252fae.1723638851.git.skaplun@tarantool.org> In-Reply-To: <8e9e2481942c2c98a1e7f078e71b29edab252fae.1723638851.git.skaplun@tarantool.org> X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9F97E3C14763C38E21D034174EA8ECC476D3C65BCD9935719182A05F53808504083DB97897F7F1BF5C7A4B249DE6549FDC542D3DD825B814E79C1F1751ECA059DE49391A50CB82CE1 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7495A032B936E882FEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006377548186386978BE68638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D857C9BE45C5F5543DD30FF848BCD0465FBE911DE4F67F5DD2CC7F00164DA146DAFE8445B8C89999728AA50765F7900637F6B57BC7E64490618DEB871D839B7333395957E7521B51C2DFABB839C843B9C08941B15DA834481F8AA50765F7900637CAEE156C82D3D7D9389733CBF5DBD5E9B5C8C57E37DE458BD9DD9810294C998ED8FC6C240DEA76428AA50765F790063741880789376DFC6ED81D268191BDAD3DBD4B6F7A4D31EC0BE2F48590F00D11D6D81D268191BDAD3D78DA827A17800CE7541FADD3D81556A7EC76A7562686271ED91E3A1F190DE8FD2E808ACE2090B5E14AD6D5ED66289B5259CC434672EE63711DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C3045DD857D6FE754135872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-C1DE0DAB: 0D63561A33F958A544AE2212D63750895002B1117B3ED696880D9A76C90767F9C81EEE05487B0209823CB91A9FED034534781492E4B8EEAD85CCBA673D36D1A4BDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF78114DCBD2D173AC6D2CBE12716DF1CC8988F8FE4A9BBDCAE704AC68A63203249B17B6A7F8D99C9B470327EB0AC8E693BCD2D3FF96E3F7E6156798CC50E6DE44277E56948935AC115F4332CA8FE04980913E6812662D5F2AB9AF64DB4688768036DF5FE9C0001AF333F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojD5rM0r3KxnGbu1fp5VRvQw== X-Mailru-Sender: 520A125C2F17F0B1E52FEF5D219D6140E52870FC25386FEB9D780D8BA5D5FB986FE43B4657436A170152A3D17938EB451EB5A0BCEC6A560B3DDE9B364B0DF289BE2DA36745F2EEB5CEBA01FB949A1F1EEAB4BC95F72C04283CDA0F3B3F5B9367 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 03/36] test: refactor 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 Bronnikov via Tarantool-patches Reply-To: Sergey Bronnikov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" This is a multi-part message in MIME format. --------------gzPa60q1XNw3aVQRtOkYy8Wy Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi, Sergey! Thanks for the patch! Please see my comments. On 14.08.2024 16:55, Sergey Kaplun wrote: > This patch refactors the test by adding a simple > check for the content of a `debug.traceback()` result. Also, the test is > moved to the directory. The category for the test is debatable. In fact, the test target is a function from `debug` module, not coroutines. > > Also, it removes the since it is the same test > that wasn't cleaned up during the refactoring in the original > repository. > > Part of tarantool/tarantool#9398 > --- > test/LuaJIT-tests/lang/coroutine.lua | 8 -------- > test/LuaJIT-tests/lang/index | 1 - > test/LuaJIT-tests/lib/coroutine/index | 1 + > test/LuaJIT-tests/lib/coroutine/traceback.lua | 14 ++++++++++++++ > test/LuaJIT-tests/misc/coro_traceback.lua | 8 -------- > 5 files changed, 15 insertions(+), 17 deletions(-) > delete mode 100644 test/LuaJIT-tests/lang/coroutine.lua > create mode 100644 test/LuaJIT-tests/lib/coroutine/traceback.lua > delete mode 100644 test/LuaJIT-tests/misc/coro_traceback.lua > > diff --git a/test/LuaJIT-tests/lang/coroutine.lua b/test/LuaJIT-tests/lang/coroutine.lua > deleted file mode 100644 > index 405135c9..00000000 > --- a/test/LuaJIT-tests/lang/coroutine.lua > +++ /dev/null > @@ -1,8 +0,0 @@ > -do --- traceback > - local co = coroutine.create(function() > - local x = nil > - local y = x.x > - end) > - assert(coroutine.resume(co) == false) > - debug.traceback(co) > -end > diff --git a/test/LuaJIT-tests/lang/index b/test/LuaJIT-tests/lang/index > index 4ff7a297..803f32d8 100644 > --- a/test/LuaJIT-tests/lang/index > +++ b/test/LuaJIT-tests/lang/index > @@ -14,7 +14,6 @@ concat.lua > self.lua > table.lua > upvalue > -coroutine.lua > tail_recursion.lua > vararg_jit.lua > gc.lua > diff --git a/test/LuaJIT-tests/lib/coroutine/index b/test/LuaJIT-tests/lib/coroutine/index > index 9c5c17ec..c4dc6cf1 100644 > --- a/test/LuaJIT-tests/lib/coroutine/index > +++ b/test/LuaJIT-tests/lib/coroutine/index > @@ -1 +1,2 @@ > +traceback.lua > yield.lua > diff --git a/test/LuaJIT-tests/lib/coroutine/traceback.lua b/test/LuaJIT-tests/lib/coroutine/traceback.lua > new file mode 100644 > index 00000000..2b900ef1 > --- /dev/null > +++ b/test/LuaJIT-tests/lib/coroutine/traceback.lua > @@ -0,0 +1,14 @@ > +do --- traceback > + local function badfunc() > + local x = nil > + local y = x.x > + end > + > + local co = coroutine.create(badfunc) > + assert(coroutine.resume(co) == false) > + > + local traceback = debug.traceback(co) > + local line = debug.getinfo(badfunc).linedefined > + > + assert(traceback:match('traceback:.*:' .. line)) > +end > diff --git a/test/LuaJIT-tests/misc/coro_traceback.lua b/test/LuaJIT-tests/misc/coro_traceback.lua > deleted file mode 100644 > index 2676d2c6..00000000 > --- a/test/LuaJIT-tests/misc/coro_traceback.lua > +++ /dev/null > @@ -1,8 +0,0 @@ > - > -local co = coroutine.create(function() > - local x = nil > - local y = x.x > -end) > -assert(coroutine.resume(co) == false) > -debug.traceback(co) > - --------------gzPa60q1XNw3aVQRtOkYy8Wy Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit

Hi, Sergey!

Thanks for the patch! Please see my comments.

On 14.08.2024 16:55, Sergey Kaplun wrote:
This patch refactors the <lang/coroutine.lua> test by adding a simple
check for the content of a `debug.traceback()` result. Also, the test is
moved to the <lib/coroutine/> directory.

The category for the test is debatable.

In fact, the test target is a function from `debug` module,

not coroutines.


Also, it removes the <misc/coro_traceback.lua> since it is the same test
that wasn't cleaned up during the refactoring in the original
repository.

Part of tarantool/tarantool#9398
---
 test/LuaJIT-tests/lang/coroutine.lua          |  8 --------
 test/LuaJIT-tests/lang/index                  |  1 -
 test/LuaJIT-tests/lib/coroutine/index         |  1 +
 test/LuaJIT-tests/lib/coroutine/traceback.lua | 14 ++++++++++++++
 test/LuaJIT-tests/misc/coro_traceback.lua     |  8 --------
 5 files changed, 15 insertions(+), 17 deletions(-)
 delete mode 100644 test/LuaJIT-tests/lang/coroutine.lua
 create mode 100644 test/LuaJIT-tests/lib/coroutine/traceback.lua
 delete mode 100644 test/LuaJIT-tests/misc/coro_traceback.lua

diff --git a/test/LuaJIT-tests/lang/coroutine.lua b/test/LuaJIT-tests/lang/coroutine.lua
deleted file mode 100644
index 405135c9..00000000
--- a/test/LuaJIT-tests/lang/coroutine.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-do --- traceback
-  local co = coroutine.create(function()
-    local x = nil
-    local y = x.x
-  end)
-  assert(coroutine.resume(co) == false)
-  debug.traceback(co)
-end
diff --git a/test/LuaJIT-tests/lang/index b/test/LuaJIT-tests/lang/index
index 4ff7a297..803f32d8 100644
--- a/test/LuaJIT-tests/lang/index
+++ b/test/LuaJIT-tests/lang/index
@@ -14,7 +14,6 @@ concat.lua
 self.lua
 table.lua
 upvalue
-coroutine.lua
 tail_recursion.lua
 vararg_jit.lua
 gc.lua
diff --git a/test/LuaJIT-tests/lib/coroutine/index b/test/LuaJIT-tests/lib/coroutine/index
index 9c5c17ec..c4dc6cf1 100644
--- a/test/LuaJIT-tests/lib/coroutine/index
+++ b/test/LuaJIT-tests/lib/coroutine/index
@@ -1 +1,2 @@
+traceback.lua
 yield.lua
diff --git a/test/LuaJIT-tests/lib/coroutine/traceback.lua b/test/LuaJIT-tests/lib/coroutine/traceback.lua
new file mode 100644
index 00000000..2b900ef1
--- /dev/null
+++ b/test/LuaJIT-tests/lib/coroutine/traceback.lua
@@ -0,0 +1,14 @@
+do --- traceback
+  local function badfunc()
+    local x = nil
+    local y = x.x
+  end
+
+  local co = coroutine.create(badfunc)
+  assert(coroutine.resume(co) == false)
+
+  local traceback = debug.traceback(co)
+  local line = debug.getinfo(badfunc).linedefined
+
+  assert(traceback:match('traceback:.*:' .. line))
+end
diff --git a/test/LuaJIT-tests/misc/coro_traceback.lua b/test/LuaJIT-tests/misc/coro_traceback.lua
deleted file mode 100644
index 2676d2c6..00000000
--- a/test/LuaJIT-tests/misc/coro_traceback.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-
-local co = coroutine.create(function()
-  local x = nil
-  local y = x.x
-end)
-assert(coroutine.resume(co) == false)
-debug.traceback(co)
-
--------------gzPa60q1XNw3aVQRtOkYy8Wy--