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 ACCCC6EC55; Fri, 30 Jul 2021 20:32:56 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org ACCCC6EC55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1627666376; bh=uoksUQpiMMvACNM7LAuDJJm+xOeU3u+sCyTWRtq201g=; 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=VnQrwCIvcPFTZXTghoUaYscMvCDeHF7VEnI2m5F57x12oSVZiYwCaeB7ZQsTnrGwG GCt/6PPVd10x6mKYSiazoNVpDEmg6k93Epmm6IXda6ek50FM06Li9LtwKOhvMspjfb YiAQj5WtG9kHmmOQkilpbWh+WpzUmhlg80FZF+Oo= Received: from smtpng1.i.mail.ru (smtpng1.i.mail.ru [94.100.181.251]) (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 DC47E6EC55 for ; Fri, 30 Jul 2021 20:32:54 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org DC47E6EC55 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1m9WNR-00029c-I8; Fri, 30 Jul 2021 20:32:54 +0300 Date: Fri, 30 Jul 2021 20:09:16 +0300 To: =?utf-8?B?0JzQsNC60YHQuNC8INCa0L7RgNGP0LrRiNC40L0=?= Message-ID: <20210730170916.GU27855@tarantool.org> References: <1627551664.293003209@f306.i.mail.ru> <1627552623.869636273@f111.i.mail.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1627552623.869636273@f111.i.mail.ru> X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.10.1 (2018-07-13) X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD941C43E597735A9C3104FC76DFAAAAF7DA068FE323FAC4379182A05F5380850406B28FF5B02073A53FE58442F8CEE93948091AC0D88EFEBFB1361FD9697EE3CB6 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7F9D3BE5B596754B8C2099A533E45F2D0395957E7521B51C2CFCAF695D4D8E9FCEA1F7E6F0F101C6778DA827A17800CE7C8DD139BC0BB8586EA1F7E6F0F101C6723150C8DA25C47586E58E00D9D99D84E1BDDB23E98D2D38BBCA57AF85F7723F2B68D90EB974FEFB4662734F7767E81B4CC7F00164DA146DAFE8445B8C89999728AA50765F7900637CAEE156C82D3D7D9389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC8062BEEFFB5F8EA3EF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA7E827F84554CEF5019E625A9149C048EE9ECD01F8117BC8BEE2021AF6380DFAD18AA50765F790063735872C767BF85DA227C277FBC8AE2E8B9149C560DC76099D75ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-C1DE0DAB: 0D63561A33F958A53CD72B57317E02E57868C1F05EF39808B607987F9412CAC3D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA751B940EDA0DFB0535410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D349FD10E01B3CDC9E2B498817C2787572EE430128E2F6EE684E627E82D0A3C0DAEDF44957B4AC12EE71D7E09C32AA3244C13C22580895ED5CA231C5EEA942A6B843C6EB905E3A8056B927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojWBddABnKmoKCZzGNQVRFIA== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D2A4A199A792068454771D788D64D5F9BA7C8D0F45F857DBFE9F1EFEE2F478337FB559BB5D741EB964C8C2C849690F8E70A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v2 10/10] test: disable test/lua-Harness-tests/241-standalone.t on FreeBSD 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: Igor Munkin via Tarantool-patches Reply-To: Igor Munkin Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Max, Surprisingly, I haven't given LGTM for this one, and that's reasonable (luckily). The test still fails on FreeBSD[1] since there are others tests with interactive mode. I've fixed the remaining issue, so your patch[2] looks the following way: ================================================================================ Author: Maxim Kokryashkin AuthorDate: Tue Jul 20 16:40:46 2021 +0300 Commit: Igor Munkin CommitDate: Fri Jul 30 14:20:54 2021 +0300 test: disable interactive mode assertions on BSD Tarantool interactive mode misbehaviour has been found on FreeBSD (for more info see tarantool/tarantool#6231). Hence, all assertions using interactive mode are skipped on FreeBSD until the mentioned issue is resolved. Resolves tarantool/tarantool#5970 Part of tarantool/tarantool#4473 Relates to tarantool/tarantool#6231 diff --git a/test/lua-Harness-tests/241-standalone.t b/test/lua-Harness-tests/241-standalone.t index afbcf5b8..5b353491 100755 --- a/test/lua-Harness-tests/241-standalone.t +++ b/test/lua-Harness-tests/241-standalone.t @@ -112,22 +112,26 @@ f = io.popen(cmd) equals(f:read'*l', 'Hello World', "redirect") f:close() -cmd = lua .. " -i hello-241.lua < hello-241.lua 2>&1" -f = io.popen(cmd) -matches(f:read'*l', banner, "-i") -if ujit then - matches(f:read'*l', '^JIT:') -end -if ravi then - matches(f:read'*l', '^Copyright %(C%)') - matches(f:read'*l', '^Portions Copyright %(C%)') - matches(f:read'*l', '^Options') -end -if _TARANTOOL then - matches(f:read'*l', "^type 'help' for interactive help") +-- FIXME: Tarantool interactive mode misbehaviour on +-- FreeBSD (for more info, see #6231). +if jit.os ~= 'BSD' then + cmd = lua .. " -i hello-241.lua < hello-241.lua 2>&1" + f = io.popen(cmd) + matches(f:read'*l', banner, "-i") + if ujit then + matches(f:read'*l', '^JIT:') + end + if ravi then + matches(f:read'*l', '^Copyright %(C%)') + matches(f:read'*l', '^Portions Copyright %(C%)') + matches(f:read'*l', '^Options') + end + if _TARANTOOL then + matches(f:read'*l', "^type 'help' for interactive help") + end + equals(f:read'*l', 'Hello World') + f:close() end -equals(f:read'*l', 'Hello World') -f:close() cmd = lua .. [[ -e"a=1" -e "print(a)"]] f = io.popen(cmd) @@ -186,10 +190,14 @@ equals(f:read'*l', '1', "-e & script") equals(f:read'*l', 'Hello World') f:close() -cmd = lua .. [[ -e"a=1" -i < hello-241.lua 2>&1]] -f = io.popen(cmd) -matches(f:read'*l', banner, "-e & -i") -f:close() +-- FIXME: Tarantool interactive mode misbehaviour on +-- FreeBSD (for more info, see #6231). +if jit.os ~= 'BSD' then + cmd = lua .. [[ -e"a=1" -i < hello-241.lua 2>&1]] + f = io.popen(cmd) + matches(f:read'*l', banner, "-e & -i") + f:close() +end cmd = lua .. [[ -e "?syntax error?" 2>&1]] f = io.popen(cmd) ================================================================================ CI is green now[3], so LGTM for this one and I'll push your patchset to the trunk in a jiffy. I also changed "Part of tarantool/tarantool#5970" back to "Resolves tarantool/tarantool#5970". I'll move Tarantool profile integration to a separate issue, so we can close this one. [1]: https://github.com/tarantool/tarantool/commit/a19cf6a [2]: https://github.com/tarantool/luajit/commit/178158c [3]: https://github.com/tarantool/tarantool/commit/c9fd7ba -- Best regards, IM