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 E732F9FFE81; Sun, 25 Feb 2024 14:41:19 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org E732F9FFE81 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1708861280; bh=3RfwKHPxprExwv3wA1jsCj16HLjf+iODlab18uwNv0A=; 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=Q/pl5qvjFsXRsLLy/+yShHWh6tHf7OAOm7MqduTCR45lhn8nXnDwPs+Wfk1oCE3ix 2SFTOWzp7dIQRgv97gS/Y7vpAjNm54FYh69AliiQmyBIBA/yaIaR54qvUEzNJs6Ggq qtBlLCHEWwmJII07id8VgHjx6y/zQUbHMwUpPSPk= Received: from smtp48.i.mail.ru (smtp48.i.mail.ru [95.163.41.86]) (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 1909257A520 for ; Sun, 25 Feb 2024 14:41:19 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 1909257A520 Received: by smtp48.i.mail.ru with esmtpa (envelope-from ) id 1reCsf-00000008doX-3ffG; Sun, 25 Feb 2024 14:41:18 +0300 Date: Sun, 25 Feb 2024 14:41:17 +0300 To: Igor Munkin Message-ID: References: <3e891e97ae52ea897bdd4d7d7c8cc18a5335a687.1708856482.git.imun@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <3e891e97ae52ea897bdd4d7d7c8cc18a5335a687.1708856482.git.imun@tarantool.org> X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD90B4B6FE9E606E496BDDC6C3EAAC562B006F5046F2EAD813400894C459B0CD1B93D3146B6DD66E3B1E8ACA01570444C236C210044636939DFABBEC4B04B7E60AA4B72E82432766FBE X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7ECD3FEFFF0C7120DC2099A533E45F2D0395957E7521B51C2CFCAF695D4D8E9FCEA1F7E6F0F101C6778DA827A17800CE775E4C393EFDC22A2EA1F7E6F0F101C6723150C8DA25C47586E58E00D9D99D84E1BDDB23E98D2D38B73AB1701401CD871059491AE03F7AF7D9099EC5E58CC50B33DD5FF71A3A2C369A471835C12D1D9774AD6D5ED66289B5278DA827A17800CE74A95F4E53E8DCE969FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C327ED053E960B195E117882F4460429728AD0CFFFB425014E868A13BD56FB6657D81D268191BDAD3DC09775C1D3CA48CFF78FB55F308B71C4BA3038C0950A5D36C8A9BA7A39EFB766D91E3A1F190DE8FDBA3038C0950A5D36D5E8D9A59859A8B63270180FE06331E376E601842F6C81A1F004C906525384303E02D724532EE2C3F43C7A68FF6260569E8FC8737B5C2249957A4DEDD2346B42E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6300D3B61E77C8D3B089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A5288206F84BD309115002B1117B3ED696B3C55E0BFDB658C9219207EC0A953D2C823CB91A9FED034534781492E4B8EEAD37F46C620FF2CAEEBDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF3CDD797167109DA4ABFD778D31FF8989FB926E65ED014D67951D9F70A6AD81CC2B6ADA43BC89BCA9A653534C7294CACCEEC4C952A63AB48216B665CCF936D3B54820817473F8A35D5F4332CA8FE04980913E6812662D5F2A54F6898A6FDCBDC72A617DFBE5FEC2C6383653B6C8D9AE0FD16FCAA6493B703A X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojhcsd5OwWmog1P+/lvwhQqw== X-Mailru-Sender: 7940E2A4EB16C9970E7603824FE97C203D3146B6DD66E3B1E8ACA01570444C236788FFC82090DA8AB6F7D78CE1F58EAD61AD1BC23DFB21333DDE9B364B0DF289BB83A8C3DAEBA78A61AAEF30F77CACB9EAB4BC95F72C04283CDA0F3B3F5B9367 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 2/2] test: enable CLI-related lua-Harness tests back 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: Maxim Kokryashkin via Tarantool-patches Reply-To: Maxim Kokryashkin Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi, Igor! Thanks for the patch! LGTM after fixing comments below. On Sun, Feb 25, 2024 at 10:41:07AM +0000, Igor Munkin wrote: > Tarantool supports -b and -j options to use LuaJIT modules since the > commit bf8b76a4dfc9dd62d4131e90e2ae5d83843b6630 ("lua: proxy -j and -b > flags"), so 241-standalone.t and 411-luajit.t tests in lua-Harness Typo: s/in lua-Harness/in the lua-Harness/ > suite, disabled in the commit 39a4db500db2619359c2c9474be016360252060d > ("test: support Tarantool in lua-Harness"), can be enabled back. > > However, -O options is still not implemented in Tarantool, so the Typo: s/is still/are still/ > related part in 411-luajit.t test chunk is still disabled. Typo: s/in/in the/ > > Follows up #5541 Typo: s/#5541/tarantool/tarantool#5541/ > > Signed-off-by: Igor Munkin > --- > test/lua-Harness-tests/241-standalone.t | 2 +- > test/lua-Harness-tests/411-luajit.t | 6 ++++-- > 2 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/test/lua-Harness-tests/241-standalone.t b/test/lua-Harness-tests/241-standalone.t > index 5b353491..aa011d3b 100755 > --- a/test/lua-Harness-tests/241-standalone.t > +++ b/test/lua-Harness-tests/241-standalone.t > @@ -29,7 +29,7 @@ L > --]] > > require'test_assertion' > -local has_bytecode = not ujit and not ravi and not _TARANTOOL > +local has_bytecode = not ujit and not ravi > local has_error52 = _VERSION >= 'Lua 5.2' > local has_error53 = _VERSION >= 'Lua 5.3' > local has_opt_E = _VERSION >= 'Lua 5.2' or (jit and not _TARANTOOL) > diff --git a/test/lua-Harness-tests/411-luajit.t b/test/lua-Harness-tests/411-luajit.t > index 1b2da729..414e6a57 100755 > --- a/test/lua-Harness-tests/411-luajit.t > +++ b/test/lua-Harness-tests/411-luajit.t > @@ -27,7 +27,7 @@ See L > require'test_assertion' > local profile = require'profile' > > -if not jit or ujit or _TARANTOOL then > +if not jit or ujit then > skip_all("only with LuaJIT") > end > > @@ -176,7 +176,9 @@ f = io.popen(cmd) > matches(f:read'*l', errbuild("unknown luaJIT command or jit%.%* modules not installed"), "-j bad") > f:close() > > -if compiled_with_jit then > +if _TARANTOOL then > + skip("-O is not yet implemented in Tarantool") > +elseif compiled_with_jit then > cmd = lua .. " -O hello-411.lua" > f = io.popen(cmd) > equals(f:read'*l', 'Hello World', "-O") > -- > 2.39.2 >