[Tarantool-patches] [PATCH v2 10/10] test: disable test/lua-Harness-tests/241-standalone.t on FreeBSD

Igor Munkin imun at tarantool.org
Fri Jul 30 20:09:16 MSK 2021


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 at tarantool.org>
AuthorDate: Tue Jul 20 16:40:46 2021 +0300
Commit:     Igor Munkin <imun at 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


More information about the Tarantool-patches mailing list