[Tarantool-patches] [PATCH luajit v2 4/5] test: fix lua-Harness JIT-related tests

Igor Munkin imun at tarantool.org
Tue Feb 28 22:00:47 MSK 2023

lua-Harness considers whether JIT is enabled or not in the scope of the
403-jit.t and 411-luajit.t tests. However, the original condition is
wrong, since <jit.status> yields false for both cases, when JIT is just
turned off and when LuaJIT is built without compiler support. So, if
<jit.status> yields false, the latter case is considered. The condition
is fixed to differ both aforementioned cases in the following way: when
jit.opt is nil, LuaJIT is built without compiler; otherwise, JIT support
is on board.

Part of tarantool/tarantool#8252

Signed-off-by: Igor Munkin <imun at tarantool.org>
 test/lua-Harness-tests/403-jit.t    | 2 +-
 test/lua-Harness-tests/411-luajit.t | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/lua-Harness-tests/403-jit.t b/test/lua-Harness-tests/403-jit.t
index 0f986da9..1a88564b 100755
--- a/test/lua-Harness-tests/403-jit.t
+++ b/test/lua-Harness-tests/403-jit.t
@@ -31,7 +31,7 @@ if not jit then
     skip_all("only with LuaJIT")
-local compiled_with_jit = jit.status()
+local compiled_with_jit = jit.opt ~= nil
 local luajit20 = jit.version_num < 20100 and not jit.version:match'RaptorJIT'
 local has_jit_opt = compiled_with_jit
 local has_jit_security = jit.security
diff --git a/test/lua-Harness-tests/411-luajit.t b/test/lua-Harness-tests/411-luajit.t
index 3a9a7b8f..6cfd6837 100755
--- a/test/lua-Harness-tests/411-luajit.t
+++ b/test/lua-Harness-tests/411-luajit.t
@@ -37,7 +37,7 @@ if not pcall(io.popen, lua .. [[ -e "a=1"]]) then
     skip_all("io.popen not supported")
-local compiled_with_jit = jit.status()
+local compiled_with_jit = jit.opt ~= nil
 local has_jutil = pcall(require, 'jit.util')
 local has_openresty_listing = profile.openresty or jit.version:match'moonjit'

More information about the Tarantool-patches mailing list