From: Igor Munkin via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Maxim Kokryashkin <m.kokryashkin@tarantool.org>, Sergey Kaplun <skaplun@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH luajit 2/2] test: enable CLI-related lua-Harness tests back Date: Sun, 25 Feb 2024 10:41:07 +0000 [thread overview] Message-ID: <3e891e97ae52ea897bdd4d7d7c8cc18a5335a687.1708856482.git.imun@tarantool.org> (raw) In-Reply-To: <cover.1708856482.git.imun@tarantool.org> Tarantool supports -b and -j options to use LuaJIT modules since the commit bf8b76a4dfc9dd62d4131e90e2ae5d83843b6630 ("lua: proxy -j and -b flags"), so 241-standalone.t and 411-luajit.t tests in lua-Harness suite, disabled in the commit 39a4db500db2619359c2c9474be016360252060d ("test: support Tarantool in lua-Harness"), can be enabled back. However, -O options is still not implemented in Tarantool, so the related part in 411-luajit.t test chunk is still disabled. Follows up #5541 Signed-off-by: Igor Munkin <imun@tarantool.org> --- test/lua-Harness-tests/241-standalone.t | 2 +- test/lua-Harness-tests/411-luajit.t | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test/lua-Harness-tests/241-standalone.t b/test/lua-Harness-tests/241-standalone.t index 5b353491..aa011d3b 100755 --- a/test/lua-Harness-tests/241-standalone.t +++ b/test/lua-Harness-tests/241-standalone.t @@ -29,7 +29,7 @@ L<https://www.lua.org/manual/5.4/manual.html#7> --]] require'test_assertion' -local has_bytecode = not ujit and not ravi and not _TARANTOOL +local has_bytecode = not ujit and not ravi local has_error52 = _VERSION >= 'Lua 5.2' local has_error53 = _VERSION >= 'Lua 5.3' local has_opt_E = _VERSION >= 'Lua 5.2' or (jit and not _TARANTOOL) diff --git a/test/lua-Harness-tests/411-luajit.t b/test/lua-Harness-tests/411-luajit.t index 1b2da729..414e6a57 100755 --- a/test/lua-Harness-tests/411-luajit.t +++ b/test/lua-Harness-tests/411-luajit.t @@ -27,7 +27,7 @@ See L<https://luajit.org/running.html> require'test_assertion' local profile = require'profile' -if not jit or ujit or _TARANTOOL then +if not jit or ujit then skip_all("only with LuaJIT") end @@ -176,7 +176,9 @@ f = io.popen(cmd) matches(f:read'*l', errbuild("unknown luaJIT command or jit%.%* modules not installed"), "-j bad") f:close() -if compiled_with_jit then +if _TARANTOOL then + skip("-O is not yet implemented in Tarantool") +elseif compiled_with_jit then cmd = lua .. " -O hello-411.lua" f = io.popen(cmd) equals(f:read'*l', 'Hello World', "-O") -- 2.39.2
next prev parent reply other threads:[~2024-02-25 10:55 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-02-25 10:41 [Tarantool-patches] [PATCH luajit 0/2] Enable CLI-related tests in lua-Harness Igor Munkin via Tarantool-patches 2024-02-25 10:41 ` [Tarantool-patches] [PATCH luajit 1/2] test: introduce routine to build error message Igor Munkin via Tarantool-patches 2024-02-25 11:37 ` Maxim Kokryashkin via Tarantool-patches 2024-02-25 19:27 ` Igor Munkin via Tarantool-patches 2024-02-25 10:41 ` Igor Munkin via Tarantool-patches [this message] 2024-02-25 11:41 ` [Tarantool-patches] [PATCH luajit 2/2] test: enable CLI-related lua-Harness tests back Maxim Kokryashkin via Tarantool-patches 2024-02-25 19:31 ` Igor Munkin via Tarantool-patches 2024-02-25 19:41 ` Igor Munkin via Tarantool-patches 2024-02-27 8:36 ` [Tarantool-patches] [PATCH luajit 0/2] Enable CLI-related tests in lua-Harness Sergey Kaplun via Tarantool-patches 2024-02-28 18:25 ` Sergey Kaplun 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=3e891e97ae52ea897bdd4d7d7c8cc18a5335a687.1708856482.git.imun@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=imun@tarantool.org \ --cc=m.kokryashkin@tarantool.org \ --cc=skaplun@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH luajit 2/2] test: enable CLI-related lua-Harness tests back' \ /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