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 D8AF16F3C7; Fri, 26 Mar 2021 10:47:11 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D8AF16F3C7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1616744831; bh=pp1a3hCiOqTuyYXIqv9fNJqAXxG6PbZMA//7KRaq3eE=; 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=iqkj97VrV7Xrl61rYsKzKIqP8BFjYbKNl+ZVKuzkTyxO/izhagzjwi2gCK2lI0EaQ HYy4g55eXdIMizsSe+y3FAOP6vbAd/9BuRmysoVlTTyZ31rpeRkB4vl6KJHd/MX/0P o28hDrmVNjry3euLLgS15H8DX8nj+i1ky1vQ1QTo= Received: from smtp63.i.mail.ru (smtp63.i.mail.ru [217.69.128.43]) (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 684506BD3A for ; Fri, 26 Mar 2021 10:44:13 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 684506BD3A Received: by smtp63.i.mail.ru with esmtpa (envelope-from ) id 1lPh8e-00042u-DA; Fri, 26 Mar 2021 10:44:12 +0300 To: Sergey Ostanevich , Igor Munkin Date: Fri, 26 Mar 2021 10:42:49 +0300 Message-Id: <05d8289981e0933402c01659b6785a309d289036.1616743343.git.skaplun@tarantool.org> X-Mailer: git-send-email 2.31.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD9064ADF4728AA0EE9F3698E42D5F8E2CF5ABB710F58BD1CA8182A05F5380850409D6E82EE2D5345C78DDBF55AADA7B350D7CDD69B60630036DFCBC7E92A441B63 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7BC08626EA5717D14EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063790C8302959DAAF098638F802B75D45FF914D58D5BE9E6BC131B5C99E7648C95C5DD32608FC869F5DB50908D3D34A491CBE8E66CAF816FFEEA471835C12D1D9774AD6D5ED66289B5278DA827A17800CE709B92020B71E24959FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C3A367EA73E0D98AAD117882F4460429728AD0CFFFB425014E868A13BD56FB6657E2021AF6380DFAD1A18204E546F3947C0B7D0EA88DDEDAC722CA9DD8327EE4930A3850AC1BE2E7351D6A3D1828C120DEC4224003CC83647689D4C264860C145E X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C4C7A0BC55FA0FE5FC522CCF267CC2B9BFA2BEC6BD882CD60011000F9D54E64B95B1881A6453793CE9C32612AADDFBE061C61BE10805914D3804EBA3D8E7E5B87ABF8C51168CD8EBDB5F0C88D684269EDEDC48ACC2A39D04F89CDFB48F4795C241BDAD6C7F3747799A X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34324A9840C798D500E6EA3A2AE6EF286B567A4F6FE15B5FA2F84B38B063E5AAE6BE6246B72F07D8B81D7E09C32AA3244CC64A418435C89920B7A571D846CB636FA90944CA99CF22E3927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojapPp7P/VpAjJ+eyjdupsrg== X-Mailru-Sender: 3B9A0136629DC91206CBC582EFEF4CB430A3FDBA4ADD6DADC37CE200D0FCECB7C229C8A6E59C67F7F2400F607609286E924004A7DEC283833C7120B22964430C52B393F8C72A41A89437F6177E88F7363CDA0F3B3F5B9367 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 luajit 06/30] test: disable PUC Lua tests confused by -v output 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" Version and status are printed in stdout instead stderr since LuaJIT-2.0.0-beta11 (as it is not an error message). See commit 0bd1a66f2f055211ef55834ccebca3b82d03c735 (Print version and JIT status to stdout, not stderr.). This behavior is the same as in Lua 5.2. This patch disables tests confused by unexpected -v output to stdout. Relates to tarantool/tarantool#5687 Part of tarantool/tarantool#5845 Part of tarantool/tarantool#4473 --- test/PUC-Lua-5.1-tests/main.lua | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/test/PUC-Lua-5.1-tests/main.lua b/test/PUC-Lua-5.1-tests/main.lua index c11a576..56f56a0 100644 --- a/test/PUC-Lua-5.1-tests/main.lua +++ b/test/PUC-Lua-5.1-tests/main.lua @@ -103,26 +103,37 @@ prepfile[[ RUN("lua - < %s > %s", prog, out) checkout("1\tnil\n") +-- Version and status are printed in stdout instead stderr since +-- LuaJIT-2.0.0-beta11 (as it is not an error message). +-- See commit 0bd1a66f2f055211ef55834ccebca3b82d03c735 +-- (Print version and JIT status to stdout, not stderr.). +-- This behavior is the same as in Lua 5.2. +-- In Lua 5.2 this feature was introduced via commit +-- 9e7de9473c65baee1f567852a778f2d33a47ea83. +-- See also https://github.com/tarantool/tarantool/issues/5687. prepfile[[ = (6*2-6) -- === a = 10 print(a) = a]] -RUN([[lua -e"_PROMPT='' _PROMPT2=''" -i < %s > %s]], prog, out) -checkout("6\n10\n10\n\n") +-- FIXME: Behavior is different for LuaJIT. See the comment above. +-- RUN([[lua -e"_PROMPT='' _PROMPT2=''" -i < %s > %s]], prog, out) +-- checkout("6\n10\n10\n\n") prepfile("a = [[b\nc\nd\ne]]\n=a") print(prog) -RUN([[lua -e"_PROMPT='' _PROMPT2=''" -i < %s > %s]], prog, out) -checkout("b\nc\nd\ne\n\n") +-- 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") prompt = "alo" prepfile[[ -- a = 2 ]] -RUN([[lua "-e_PROMPT='%s'" -i < %s > %s]], prompt, prog, out) -checkout(string.rep(prompt, 3).."\n") +-- 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") s = [=[ -- function f ( x ) @@ -140,8 +151,9 @@ assert( a == b ) =f( 11 ) ]=] s = string.gsub(s, ' ', '\n\n') prepfile(s) -RUN([[lua -e"_PROMPT='' _PROMPT2=''" -i < %s > %s]], prog, out) -checkout("11\n1\t2\n\n") +-- FIXME: Behavior is different for LuaJIT. See the comment above. +-- RUN([[lua -e"_PROMPT='' _PROMPT2=''" -i < %s > %s]], prog, out) +-- checkout("11\n1\t2\n\n") prepfile[[#comment in 1st line without \n at the end]] RUN("lua %s", prog) -- 2.31.0