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 5B5CC6EC55; Fri, 8 Oct 2021 11:56:34 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 5B5CC6EC55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1633683394; bh=3Mx81o2tOb/egSOAR82uQyw/sXv70gYMLc8QUfYLnnk=; 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=Vwgd9hn65Yd93wOe5E0Wfbox88lqxa4eO1lfwNdcv0JabxkrOwIHn1S8H7WEs9fao gdmZc484pIVjPILImyDB44HLUB2r5iubHIN0Eal3tzfymnn72ZkchYGbTMO7i4HnJE nI4MAsCS8PUkSxTPwkwOKam3VdgTgv1nni4DOOt4= Received: from smtp50.i.mail.ru (smtp50.i.mail.ru [94.100.177.110]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 74E046EC55 for ; Fri, 8 Oct 2021 11:56:32 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 74E046EC55 Received: by smtp50.i.mail.ru with esmtpa (envelope-from ) id 1mYlg7-0006Bl-8T; Fri, 08 Oct 2021 11:56:31 +0300 Date: Fri, 8 Oct 2021 11:54:51 +0300 To: Maxim Kokryashkin Message-ID: References: <20210924135814.58102-1-m.kokryashkin@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210924135814.58102-1-m.kokryashkin@tarantool.org> X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9A6D4E3B1981C4C7DF7D8982532F2974332C9520735F94DDB182A05F538085040BE5B3023899A7B0072578BB21DB1C67132C5A642DA5F49EEAD4512ED2D9D055F X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7BC08626EA5717D14EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637BB46061768088B55EA1F7E6F0F101C6723150C8DA25C47586E58E00D9D99D84E1BDDB23E98D2D38BBCA57AF85F7723F2123186FE6B5003F13A4E88147668793DCC7F00164DA146DAFE8445B8C89999728AA50765F790063783E00425F71A4181389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC82FFDA4F57982C5F4F6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA7E827F84554CEF5019E625A9149C048EE9ECD01F8117BC8BEE2021AF6380DFAD18AA50765F790063735872C767BF85DA227C277FBC8AE2E8B2303E78B907142AC75ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-C1DE0DAB: 0D63561A33F958A5D65DB55DD8AD2D53398AFAA35AAC22CE667E313ED619CBC0D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA759D2A03B9C34326B3410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3452F7993FB7281BFD0463B9F6E100FEB059B4FD7827CC36C8ECEDBCB93C482CC419652E743C9961B11D7E09C32AA3244C7E38AB8F2ABFB496D8212E7BB31805C2F165894D92D62706927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojbhzlKa2eIcWgGYaynDsEuQ== X-Mailru-Sender: 3B9A0136629DC91206CBC582EFEF4CB48B7361355EFB42D4561857A3290D9B6965AA5CEE0DD0B02FF2400F607609286E924004A7DEC283833C7120B22964430C52B393F8C72A41A89437F6177E88F7363CDA0F3B3F5B9367 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit] test: adapt disabled tests from PUC-Rio 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" Hi, Maxim! Thanks for the patch! Please answer my questions below. On 24.09.21, Maxim Kokryashkin wrote: > Version and status are printed in stdout instead stderr > since LuaJIT-2.0.0-beta11 (as it is not an error message). This behavior Please mention the corresponding commit. > is the same as in Lua 5.2, so necessary changes in tests can be > adapted from PUC-Rio Lua 5.2 test suite. > > Closes tarantool/tarantool#5687 > --- > Issue: https://github.com/tarantool/tarantool/issues/5687 > Branch: https://github.com/tarantool/luajit/tree/fckxorg/gh-5687-adapt-tests-output-PUC-Rio Please provide Tarantool branch too. It is convinient to reviewer to check that CI is OK. > > test/PUC-Rio-Lua-5.1-tests/main.lua | 53 +++++++++++++++++++---------- > 1 file changed, 35 insertions(+), 18 deletions(-) > > diff --git a/test/PUC-Rio-Lua-5.1-tests/main.lua b/test/PUC-Rio-Lua-5.1-tests/main.lua > index 07facc4c..34e028f5 100644 > --- a/test/PUC-Rio-Lua-5.1-tests/main.lua > +++ b/test/PUC-Rio-Lua-5.1-tests/main.lua > @@ -24,11 +24,33 @@ local prepfile = function (s, p) > +-- Test is adapted from PUC-Rio Lua 5.2 test suite. > +-- See comment for checkprogout(). > prepfile("a = [[b\nc\nd\ne]]\n=a") > print(prog) > --- FIXME: Behavior is different for LuaJIT. See the comment above. > --- RUN([[lua -e"_PROMPT='' _PROMPT2=''" -i < %s > %s]], prog, out) > --- checkout("b\nc\nd\ne\n\n") > +RUN([[lua -e"_PROMPT='' _PROMPT2=''" -i < %s > %s]], prog, out) > +checkprogout("b\nc\nd\ne\n\n") > > +-- Test is adapted from PUC-Rio Lua 5.2 test suite. > +-- See comment for checkprogout(). > prompt = "alo" > prepfile[[ -- > a = 2 > ]] > --- FIXME: Behavior is different for LuaJIT. See the comment above. > --- RUN([[lua "-e_PROMPT='%s'" -i < %s > %s]], prompt, prog, out) > --- checkout(string.rep(prompt, 3).."\n") > +RUN([[lua "-e_PROMPT='%s'" -i < %s > %s]], prompt, prog, out) > +checkprogout(string.rep(prompt, 3).."\n") Lua 5.2 test suite has the different test here: | RUN([[lua "-e_PROMPT='%s'" -i < %s > %s]], prompt, prog, out) | local t = getoutput() | assert(string.find(t, prompt .. ".*" .. prompt .. ".*" .. prompt)) Why did you change it? > > s = [=[ -- > function f ( x ) Why didn't you adjust the next test with multiple returns too? See the issue's comment for example [1]. > -- > 2.33.0 > [1]: https://github.com/tarantool/tarantool/issues/5687#issuecomment-758682525 -- Best regards, Sergey Kaplun