From: Igor Munkin via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: "Максим Корякшин" <m.kokryashkin@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH v2 10/10] test: disable test/lua-Harness-tests/241-standalone.t on FreeBSD Date: Fri, 30 Jul 2021 20:09:16 +0300 [thread overview] Message-ID: <20210730170916.GU27855@tarantool.org> (raw) In-Reply-To: <1627552623.869636273@f111.i.mail.ru> 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 <m.kokryashkin@tarantool.org> AuthorDate: Tue Jul 20 16:40:46 2021 +0300 Commit: Igor Munkin <imun@tarantool.org> 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
next prev parent reply other threads:[~2021-07-30 17:32 UTC|newest] Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-20 16:26 [Tarantool-patches] [PATCH v2 00/10] test: lua-Harness suite patch bump Maxim Kokryashkin via Tarantool-patches 2021-07-20 16:26 ` [Tarantool-patches] [PATCH v2 01/10] test: port lua-Harness to Test.Assertion Maxim Kokryashkin via Tarantool-patches 2021-07-25 21:08 ` Igor Munkin via Tarantool-patches 2021-07-26 10:38 ` Максим Корякшин via Tarantool-patches 2021-07-27 6:41 ` Sergey Kaplun via Tarantool-patches 2021-07-27 22:18 ` Максим Корякшин via Tarantool-patches 2021-07-20 16:26 ` [Tarantool-patches] [PATCH v2 02/10] test: rename lua-Harness tap to test_assertion Maxim Kokryashkin via Tarantool-patches 2021-07-25 21:08 ` Igor Munkin via Tarantool-patches 2021-07-27 6:27 ` Sergey Kaplun via Tarantool-patches 2021-07-20 16:26 ` [Tarantool-patches] [PATCH v2 03/10] test: use CI friendly variables in lua-Harness Maxim Kokryashkin via Tarantool-patches 2021-07-25 21:09 ` Igor Munkin via Tarantool-patches 2021-07-27 9:01 ` Sergey Kaplun via Tarantool-patches 2021-07-27 22:23 ` Максим Корякшин via Tarantool-patches 2021-07-20 16:26 ` [Tarantool-patches] [PATCH v2 04/10] test: refactor with _retrieve_progname Maxim Kokryashkin via Tarantool-patches 2021-07-25 21:09 ` Igor Munkin via Tarantool-patches 2021-07-27 9:27 ` Sergey Kaplun via Tarantool-patches 2021-07-27 22:28 ` Максим Корякшин via Tarantool-patches 2021-07-20 16:26 ` [Tarantool-patches] [PATCH v2 05/10] test: refactor with _dofile Maxim Kokryashkin via Tarantool-patches 2021-07-25 21:10 ` Igor Munkin via Tarantool-patches 2021-07-26 12:11 ` Максим Корякшин via Tarantool-patches 2021-07-27 9:34 ` Sergey Kaplun via Tarantool-patches 2021-07-27 22:36 ` Максим Корякшин via Tarantool-patches 2021-07-20 16:26 ` [Tarantool-patches] [PATCH v2 06/10] test: support tarantool in lua-Harness Maxim Kokryashkin via Tarantool-patches 2021-07-25 21:11 ` Igor Munkin via Tarantool-patches 2021-07-26 11:07 ` Максим Корякшин via Tarantool-patches 2021-07-26 19:46 ` Igor Munkin via Tarantool-patches 2021-07-27 10:04 ` Sergey Kaplun via Tarantool-patches 2021-07-28 17:40 ` Максим Корякшин via Tarantool-patches 2021-07-28 17:42 ` Максим Корякшин via Tarantool-patches 2021-07-28 18:34 ` Sergey Kaplun via Tarantool-patches 2021-07-29 9:19 ` Максим Корякшин via Tarantool-patches 2021-07-29 9:22 ` Igor Munkin via Tarantool-patches 2021-07-29 10:12 ` Максим Корякшин via Tarantool-patches 2021-07-29 9:47 ` Sergey Kaplun via Tarantool-patches 2021-07-20 16:26 ` [Tarantool-patches] [PATCH v2 07/10] test: backport lua-Harness directory detection Maxim Kokryashkin via Tarantool-patches 2021-07-25 21:12 ` Igor Munkin via Tarantool-patches 2021-07-26 11:13 ` Максим Корякшин via Tarantool-patches 2021-07-28 18:37 ` Sergey Kaplun via Tarantool-patches 2021-07-20 16:26 ` [Tarantool-patches] [PATCH v2 08/10] test: support tarantool cli in lua-Harness Maxim Kokryashkin via Tarantool-patches 2021-07-25 21:13 ` Igor Munkin via Tarantool-patches 2021-07-26 11:17 ` Максим Корякшин via Tarantool-patches 2021-07-26 19:53 ` Igor Munkin via Tarantool-patches 2021-07-28 18:44 ` Sergey Kaplun via Tarantool-patches 2021-07-28 18:50 ` Sergey Kaplun via Tarantool-patches 2021-07-29 9:23 ` Максим Корякшин via Tarantool-patches 2021-07-20 16:26 ` [Tarantool-patches] [PATCH v2 09/10] test: update lua-Harness to b7b1a9a2 Maxim Kokryashkin via Tarantool-patches 2021-07-25 21:14 ` Igor Munkin via Tarantool-patches 2021-07-26 12:21 ` Максим Корякшин via Tarantool-patches 2021-07-26 20:04 ` Igor Munkin via Tarantool-patches 2021-07-28 18:48 ` Sergey Kaplun via Tarantool-patches 2021-07-29 9:27 ` Максим Корякшин via Tarantool-patches 2021-07-20 16:26 ` [Tarantool-patches] [PATCH v2 10/10] test: disable test/lua-Harness-tests/241-standalone.t on FreeBSD Maxim Kokryashkin via Tarantool-patches 2021-07-25 21:17 ` Igor Munkin via Tarantool-patches 2021-07-26 12:31 ` Максим Корякшин via Tarantool-patches 2021-07-26 12:32 ` Максим Корякшин via Tarantool-patches 2021-07-26 12:36 ` Максим Корякшин via Tarantool-patches 2021-07-26 20:13 ` Igor Munkin via Tarantool-patches 2021-07-27 6:21 ` Sergey Kaplun via Tarantool-patches 2021-07-29 9:41 ` Максим Корякшин via Tarantool-patches 2021-07-29 9:45 ` Sergey Kaplun via Tarantool-patches 2021-07-29 9:57 ` Максим Корякшин via Tarantool-patches 2021-07-30 17:09 ` Igor Munkin via Tarantool-patches [this message] 2021-07-25 21:03 ` [Tarantool-patches] [PATCH v2 00/10] test: lua-Harness suite patch bump Igor Munkin via Tarantool-patches 2021-07-30 19:19 ` Igor Munkin via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210730170916.GU27855@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=imun@tarantool.org \ --cc=m.kokryashkin@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v2 10/10] test: disable test/lua-Harness-tests/241-standalone.t on FreeBSD' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox