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 B028DBEA813; Tue, 11 Jun 2024 13:00:05 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org B028DBEA813 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1718100005; bh=S/sqfKFJtWG84hTws797tgNX477B7GmxDCfo1lQPcLQ=; h=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=zX8U11dX0ffQ8rJ6QgW2Sh5bFgdIEQddq2bVm9pCOLwXudhPx6nsPDzUV0EcIUaoz Rs1rvwD4zemDIWa47bm8z85p5uhHlFVp2H4usfQ8qpXF2E3m989ybvwvg09YSkITAU cW+6smc2k9IYVNJxMz1gdra8iHMnORwx/c+QOG1w= Received: from smtp33.i.mail.ru (smtp33.i.mail.ru [95.163.41.74]) (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 2984B6B03F7 for ; Tue, 11 Jun 2024 13:00:04 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 2984B6B03F7 Received: by smtp33.i.mail.ru with esmtpa (envelope-from ) id 1sGyIM-0000000AESc-0Td2; Tue, 11 Jun 2024 13:00:02 +0300 Content-Type: multipart/alternative; boundary="------------03zvyUAkMvCAMhHpRnursVUg" Message-ID: <0bdff943-a0fe-42f3-95cd-8214ffc33d42@tarantool.org> Date: Tue, 11 Jun 2024 13:00:01 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Sergey Kaplun , Sergey Bronnikov References: <88eab16fca9056a057df5506a0af637c8d4a0ffd.1717682341.git.sergeyb@tarantool.org> Content-Language: en-US In-Reply-To: X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD98DB933291B66615A461445DEC4596C35564C73348DFCD9CD182A05F538085040AFAC557EB4D623BAC591814E25D11F9F0D4A1FC235CDEA69228C6AFED91BF13DE85E5E11D6F148DD X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7AD2F2D6F6013FF7FC2099A533E45F2D0395957E7521B51C2CFCAF695D4D8E9FCEA1F7E6F0F101C6778DA827A17800CE746D93DAA4671895CEA1F7E6F0F101C6723150C8DA25C47586E58E00D9D99D84E1BDDB23E98D2D38B043BF0FB74779F36570A9D4B8BF38FF3246400401B37799AE3CCB4CB9D21C40CA471835C12D1D9774AD6D5ED66289B5278DA827A17800CE709B92020B71E24959FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C34964A708C60C975A117882F4460429728AD0CFFFB425014E868A13BD56FB6657D81D268191BDAD3DC09775C1D3CA48CF87AC71952E7BCFF33AA81AA40904B5D9CF19DD082D7633A0C84D3B47A649675F3AA81AA40904B5D98AA50765F7900637D34D9019A1B655D4CD04E86FAF290E2DB606B96278B59C421DD303D21008E29813377AFFFEAFD269176DF2183F8FC7C0D75EB778CE7D8A0C68655334FD4449CB33AC447995A7AD18262FEC7FBD7D1F5BD5E8D9A59859A8B693D5B6784794C261089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A5FA615CA55FDE250E5002B1117B3ED6967A55374A226A410FE99897350C7C491E823CB91A9FED034534781492E4B8EEAD220496FFA5CD4785BDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADBF74143AD284FC7177DD89D51EBB7742424CF958EAFF5D571004E42C50DC4CA955A7F0CF078B5EC49A30900B95165D344888A9AABCDD3225750B120365346B3C335CAEC0C99BEECF979FBD3EF710F2B40DFB24818EC2B10C1D7E09C32AA3244C149486BC68189B9DEBBA027F22CEDE66FF14D2AAAF18E455EA455F16B58544A21C197AAF4D2E4732A5AE236DF995FB59978A700BF655EAEEED6A17656DB59BCAD427812AF56FC65B X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj7p5wIdCuWKPFAsDBxY/ugg== X-Mailru-Sender: 520A125C2F17F0B1E52FEF5D219D614023014B95A67B9D03EA6E2C74775D0FF2814AE9F77AC5473E0152A3D17938EB451EB5A0BCEC6A560B3DDE9B364B0DF289BE2DA36745F2EEB5CEBA01FB949A1F1EEAB4BC95F72C04283CDA0F3B3F5B9367 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit] test: remove inline suppressions of _TARANTOOL 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 Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" This is a multi-part message in MIME format. --------------03zvyUAkMvCAMhHpRnursVUg Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Sergey, thanks for comments. Updated patch force-pushed. Sergey On 10.06.2024 12:41, Sergey Kaplun wrote: > Hi, Sergey! > Thanks for the patch! > LGTM, after fixing my comment below. > > On 06.06.24, Sergey Bronnikov wrote: >> From: Sergey Bronnikov >> >> The patch defines _TARANTOOL as a global in luacheck configuration >> file and removes inline suppressions in test files. >> --- >> Branch:https://github.com/tarantool/luajit/tree/ligurio/fix-_TARANTOOL >> > > >> 12 files changed, 1 insertion(+), 12 deletions(-) >> >> diff --git a/.luacheckrc b/.luacheckrc >> index a32012ca..62ceeaa2 100644 >> --- a/.luacheckrc >> +++ b/.luacheckrc >> @@ -1,7 +1,7 @@ >> -- Use the default LuaJIT globals. >> std = 'luajit' >> -- This fork also introduces a new global for misc API namespace. >> -read_globals = { 'misc' } >> +read_globals = { 'misc', '_TARANTOOL' } > Can we use it only for directory to avoid it appearing > in the Lua sources inside the repository? Sure. I've updated your patch a bit (formatting): --- a/.luacheckrc +++ b/.luacheckrc @@ -3,6 +3,12 @@ std = 'luajit'  -- This fork also introduces a new global for misc API namespace.  read_globals = { 'misc', '_TARANTOOL' } +-- The `_TARANTOOL` global is often used for skip condition +-- checks in tests. +files['test/tarantool-tests/'] = { +  read_globals = {'_TARANTOOL'} +} +  -- These files are inherited from the vanilla LuaJIT or different  -- test suites and need to be coherent with the upstream.  exclude_files = { > > =================================================================== > diff --git a/.luacheckrc b/.luacheckrc > index a32012ca..7b5634a5 100644 > --- a/.luacheckrc > +++ b/.luacheckrc > @@ -3,6 +3,10 @@ std = 'luajit' > -- This fork also introduces a new global for misc API namespace. > read_globals = { 'misc' } > > +-- The `_TARANTOOL` global is often used for skip condition > +-- checks. > +files['test/tarantool-tests/'] = {read_globals = {'_TARANTOOL'}} > + > -- These files are inherited from the vanilla LuaJIT or different > -- test suites and need to be coherent with the upstream. > exclude_files = { > =================================================================== > > >> >> -- These files are inherited from the vanilla LuaJIT or different >> -- test suites and need to be coherent with the upstream. > > >> -- >> 2.34.1 >> --------------03zvyUAkMvCAMhHpRnursVUg Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 8bit

Sergey,


thanks for comments.

Updated patch force-pushed.


Sergey

On 10.06.2024 12:41, Sergey Kaplun wrote:
Hi, Sergey!
Thanks for the patch!
LGTM, after fixing my comment below.

On 06.06.24, Sergey Bronnikov wrote:

From: Sergey Bronnikov <sergeyb@tarantool.org>

The patch defines _TARANTOOL as a global in luacheck configuration
file and removes inline suppressions in test files.
---
Branch: https://github.com/tarantool/luajit/tree/ligurio/fix-_TARANTOOL


<snipped>


 12 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/.luacheckrc b/.luacheckrc
index a32012ca..62ceeaa2 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -1,7 +1,7 @@
 -- Use the default LuaJIT globals.
 std = 'luajit'
 -- This fork also introduces a new global for misc API namespace.
-read_globals = { 'misc' }
+read_globals = { 'misc', '_TARANTOOL' }

Can we use it only for <tarantool-tests> directory to avoid it appearing
in the Lua sources inside the repository?

Sure.

I've updated your patch a bit (formatting):


--- a/.luacheckrc
+++ b/.luacheckrc
@@ -3,6 +3,12 @@ std = 'luajit'
 -- This fork also introduces a new global for misc API namespace.
 read_globals = { 'misc', '_TARANTOOL' }
 
+-- The `_TARANTOOL` global is often used for skip condition
+-- checks in tests.
+files['test/tarantool-tests/'] = {
+  read_globals = {'_TARANTOOL'}
+}
+
 -- These files are inherited from the vanilla LuaJIT or different
 -- test suites and need to be coherent with the upstream.
 exclude_files = {



===================================================================
diff --git a/.luacheckrc b/.luacheckrc
index a32012ca..7b5634a5 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -3,6 +3,10 @@ std = 'luajit'
 -- This fork also introduces a new global for misc API namespace.
 read_globals = { 'misc' }
 
+-- The `_TARANTOOL` global is often used for skip condition
+-- checks.
+files['test/tarantool-tests/'] = {read_globals = {'_TARANTOOL'}}
+
 -- These files are inherited from the vanilla LuaJIT or different
 -- test suites and need to be coherent with the upstream.
 exclude_files = {
===================================================================



 
 -- These files are inherited from the vanilla LuaJIT or different
 -- test suites and need to be coherent with the upstream.

<snipped>


-- 
2.34.1



    

  
  


--------------03zvyUAkMvCAMhHpRnursVUg--