<HTML><BODY><div>Hi, Igor!</div><div>Thanks for the fixes!</div><div>LGTM</div><div data-signature-widget="container"><div data-signature-widget="content"><div>--<br>Best regards,</div><div>Maxim Kokryashkin</div></div></div><div> </div><div> </div><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;"><div> <blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;"><div id=""><div class="js-helper js-readmsg-msg"><div><div id="style_16776110211594752669_BODY">This patch adjusts all tests for JIT engine to avoid failures when JIT<br>is disabled, so skipcond with the result of <jit.status> as a condition<br>is added to handle this.<br><br>Part of tarantool/tarantool#8252<br><br>Signed-off-by: Igor Munkin <<a href="/compose?To=imun@tarantool.org">imun@tarantool.org</a>><br>---<br> test/tarantool-tests/bc-jit-unpatching.test.lua | 6 ++++--<br> .../fix-fold-simplify-conv-sext.test.lua | 7 ++++---<br> .../fix-slot-check-for-mm-record.test.lua | 4 +++-<br> test/tarantool-tests/gh-4199-gc64-fuse.test.lua | 1 +<br> test/tarantool-tests/gh-4427-ffi-sandwich.test.lua | 1 +<br> .../gh-4476-fix-string-find-recording.test.lua | 4 +++-<br> .../gh-5813-resolving-of-c-symbols.test.lua | 4 +++-<br> .../gh-6065-jit-library-smoke-tests.test.lua | 4 +++-<br> .../gh-6098-fix-side-exit-patching-on-arm64.test.lua | 5 ++++-<br> test/tarantool-tests/gh-6189-cur_L.test.lua | 7 +++++--<br> ...h-6227-bytecode-allocator-for-comparisons.test.lua | 5 ++++-<br> .../gh-6371-string-char-no-arg.test.lua | 5 +++--<br> .../gh-6782-stitching-in-vmevent-handler.test.lua | 6 ++++--<br> .../gh-6976-narrowing-of-unary-minus.test.lua | 5 ++++-<br> .../gh-7264-add-proto-trace-sysprof-default.test.lua | 1 +<br> test/tarantool-tests/lj-350-sload-typecheck.test.lua | 8 +++++---<br> .../lj-356-ir-khash-non-string-obj.test.lua | 11 +++++++----<br> test/tarantool-tests/lj-357-arm64-hrefk.test.lua | 6 ++++--<br> .../lj-375-ir-bufput-signed-char.test.lua | 4 +++-<br> .../lj-408-tonumber-cdata-record.test.lua | 11 ++++++-----<br> test/tarantool-tests/lj-416-xor-before-jcc.test.lua | 6 ++++--<br> test/tarantool-tests/lj-430-maxirconst.test.lua | 1 +<br> .../lj-505-fold-no-strref-for-ptrdiff.test.lua | 4 +++-<br> .../lj-524-fold-conv-respect-src-irt.test.lua | 6 ++++--<br> .../lj-556-fix-loop-realignment.test.lua | 4 +++-<br> .../lj-584-bad-renames-for-sunk-values.test.lua | 4 +++-<br> test/tarantool-tests/lj-603-err-snap-restore.test.lua | 1 +<br> .../lj-672-cdata-allocation-recording.test.lua | 1 +<br> .../lj-864-varg-rec-base-offset.test.lua | 6 ++++--<br> test/tarantool-tests/lj-flush-on-trace.test.lua | 1 +<br> test/tarantool-tests/misclib-getmetrics-capi.test.lua | 1 +<br> test/tarantool-tests/misclib-getmetrics-lapi.test.lua | 1 +<br> test/tarantool-tests/misclib-memprof-lapi.test.lua | 2 +-<br> test/tarantool-tests/misclib-sysprof-capi.test.lua | 5 +++--<br> test/tarantool-tests/misclib-sysprof-lapi.test.lua | 5 +++--<br> 35 files changed, 106 insertions(+), 47 deletions(-)<br><br>diff --git a/test/tarantool-tests/bc-jit-unpatching.test.lua b/test/tarantool-tests/bc-jit-unpatching.test.lua<br>index 71247f0c..2c3b7c9a 100644<br>--- a/test/tarantool-tests/bc-jit-unpatching.test.lua<br>+++ b/test/tarantool-tests/bc-jit-unpatching.test.lua<br>@@ -1,9 +1,11 @@<br> local tap = require('tap')<br>-local utils = require('utils')<br>+local test = tap.test('bc-jit-unpatching'):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br>+})<br> <br>-local test = tap.test('bc-jit-unpatching')<br> test:plan(1)<br> <br>+local utils = require('utils')<br> -- Function with up-recursion.<br> local function f(n)<br> return n < 2 and n or f(n - 1) + f(n - 2)<br>diff --git a/test/tarantool-tests/fix-fold-simplify-conv-sext.test.lua b/test/tarantool-tests/fix-fold-simplify-conv-sext.test.lua<br>index 07e22c36..60eb3e7c 100644<br>--- a/test/tarantool-tests/fix-fold-simplify-conv-sext.test.lua<br>+++ b/test/tarantool-tests/fix-fold-simplify-conv-sext.test.lua<br>@@ -1,12 +1,13 @@<br> local tap = require('tap')<br>-local ffi = require('ffi')<br>-<br>-local test = tap.test('fix-fold-simplify-conv-sext')<br>+local test = tap.test('fix-fold-simplify-conv-sext'):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br>+})<br> <br> local NSAMPLES = 4<br> local NTEST = NSAMPLES * 2 - 1<br> test:plan(NTEST)<br> <br>+local ffi = require('ffi')<br> local samples = ffi.new('int [?]', NSAMPLES)<br> <br> -- Prepare data.<br>diff --git a/test/tarantool-tests/fix-slot-check-for-mm-record.test.lua b/test/tarantool-tests/fix-slot-check-for-mm-record.test.lua<br>index 8df72ec4..6161747f 100644<br>--- a/test/tarantool-tests/fix-slot-check-for-mm-record.test.lua<br>+++ b/test/tarantool-tests/fix-slot-check-for-mm-record.test.lua<br>@@ -1,7 +1,9 @@<br> -- luacheck: globals a0 a1<br> local tap = require('tap')<br>+local test = tap.test('fix-slot-check-for-mm-record'):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br>+})<br> <br>-local test = tap.test('fix-slot-check-for-mm-record')<br> test:plan(1)<br> <br> -- Before the patch, JIT compiler doesn't check slots overflow<br>diff --git a/test/tarantool-tests/gh-4199-gc64-fuse.test.lua b/test/tarantool-tests/gh-4199-gc64-fuse.test.lua<br>index 65f9faac..4513d43b 100644<br>--- a/test/tarantool-tests/gh-4199-gc64-fuse.test.lua<br>+++ b/test/tarantool-tests/gh-4199-gc64-fuse.test.lua<br>@@ -1,5 +1,6 @@<br> local tap = require('tap')<br> local test = tap.test('gh-4199-gc64-fuse'):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br> ['Test requires GC64 mode enabled'] = not require('ffi').abi('gc64'),<br> })<br> <br>diff --git a/test/tarantool-tests/gh-4427-ffi-sandwich.test.lua b/test/tarantool-tests/gh-4427-ffi-sandwich.test.lua<br>index ed3f50d1..86544196 100644<br>--- a/test/tarantool-tests/gh-4427-ffi-sandwich.test.lua<br>+++ b/test/tarantool-tests/gh-4427-ffi-sandwich.test.lua<br>@@ -1,5 +1,6 @@<br> local tap = require('tap')<br> local test = tap.test('gh-4427-ffi-sandwich'):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br> ['Disabled on *BSD due to #4819'] = jit.os == 'BSD',<br> })<br> <br>diff --git a/test/tarantool-tests/gh-4476-fix-string-find-recording.test.lua b/test/tarantool-tests/gh-4476-fix-string-find-recording.test.lua<br>index f48af173..0758b38f 100644<br>--- a/test/tarantool-tests/gh-4476-fix-string-find-recording.test.lua<br>+++ b/test/tarantool-tests/gh-4476-fix-string-find-recording.test.lua<br>@@ -1,6 +1,8 @@<br> local tap = require('tap')<br>+local test = tap.test("gh-4476-fix-string-find-recording"):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br>+})<br> <br>-local test = tap.test("gh-4476-fix-string-find-recording")<br> test:plan(1)<br> <br> local err = [[module 'kit.1.10.3-136' not found:<br>diff --git a/test/tarantool-tests/gh-5813-resolving-of-c-symbols.test.lua b/test/tarantool-tests/gh-5813-resolving-of-c-symbols.test.lua<br>index 3c6833fc..9f2c5f85 100644<br>--- a/test/tarantool-tests/gh-5813-resolving-of-c-symbols.test.lua<br>+++ b/test/tarantool-tests/gh-5813-resolving-of-c-symbols.test.lua<br>@@ -8,7 +8,9 @@ local test = tap.test("gh-5813-resolving-of-c-symbols"):skipcond({<br> test:plan(5)<br> <br> jit.off()<br>-jit.flush()<br>+-- XXX: Run JIT tuning functions in a safe frame to avoid errors<br>+-- thrown when LuaJIT is compiled with JIT engine disabled.<br>+pcall(jit.flush)<br> <br> local bufread = require "utils.bufread"<br> local symtab = require "utils.symtab"<br>diff --git a/test/tarantool-tests/gh-6065-jit-library-smoke-tests.test.lua b/test/tarantool-tests/gh-6065-jit-library-smoke-tests.test.lua<br>index 7110e351..5d7fd7e2 100644<br>--- a/test/tarantool-tests/gh-6065-jit-library-smoke-tests.test.lua<br>+++ b/test/tarantool-tests/gh-6065-jit-library-smoke-tests.test.lua<br>@@ -1,6 +1,8 @@<br> local tap = require('tap')<br>+local test = tap.test('gh-6065-jit-library-smoke-tests'):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br>+})<br> <br>-local test = tap.test('gh-6065-jit-library-smoke-tests')<br> test:plan(1)<br> <br> -- Just check whether LuaJIT is built with JIT support. Otherwise,<br>diff --git a/test/tarantool-tests/gh-6098-fix-side-exit-patching-on-arm64.test.lua b/test/tarantool-tests/gh-6098-fix-side-exit-patching-on-arm64.test.lua<br>index 4dcf3e22..cfcc6adb 100644<br>--- a/test/tarantool-tests/gh-6098-fix-side-exit-patching-on-arm64.test.lua<br>+++ b/test/tarantool-tests/gh-6098-fix-side-exit-patching-on-arm64.test.lua<br>@@ -1,5 +1,8 @@<br> local tap = require('tap')<br>-local test = tap.test('gh-6098-fix-side-exit-patching-on-arm64')<br>+local test = tap.test('gh-6098-fix-side-exit-patching-on-arm64'):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br>+})<br>+<br> test:plan(1)<br> <br> -- The function to be tested for side exit patching:<br>diff --git a/test/tarantool-tests/gh-6189-cur_L.test.lua b/test/tarantool-tests/gh-6189-cur_L.test.lua<br>index 7f2184ec..a5096a7c 100644<br>--- a/test/tarantool-tests/gh-6189-cur_L.test.lua<br>+++ b/test/tarantool-tests/gh-6189-cur_L.test.lua<br>@@ -1,9 +1,12 @@<br>-local libcur_L = require('libcur_L')<br> local tap = require('tap')<br>+local test = tap.test('gh-6189-cur_L'):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br>+})<br> <br>-local test = tap.test('gh-6189-cur_L')<br> test:plan(1)<br> <br>+local libcur_L = require('libcur_L')<br>+<br> local function cbool(cond)<br> if cond then<br> return 1<br>diff --git a/test/tarantool-tests/gh-6227-bytecode-allocator-for-comparisons.test.lua b/test/tarantool-tests/gh-6227-bytecode-allocator-for-comparisons.test.lua<br>index 9788923a..da399bcf 100644<br>--- a/test/tarantool-tests/gh-6227-bytecode-allocator-for-comparisons.test.lua<br>+++ b/test/tarantool-tests/gh-6227-bytecode-allocator-for-comparisons.test.lua<br>@@ -1,5 +1,8 @@<br> local tap = require('tap')<br>-local test = tap.test('gh-6227-bytecode-allocator-for-comparisons')<br>+local test = tap.test('gh-6227-bytecode-allocator-for-comparisons'):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br>+})<br>+<br> test:plan(1)<br> <br> -- Test file to demonstrate assertion failure during recording<br>diff --git a/test/tarantool-tests/gh-6371-string-char-no-arg.test.lua b/test/tarantool-tests/gh-6371-string-char-no-arg.test.lua<br>index ec871d19..90121860 100644<br>--- a/test/tarantool-tests/gh-6371-string-char-no-arg.test.lua<br>+++ b/test/tarantool-tests/gh-6371-string-char-no-arg.test.lua<br>@@ -1,10 +1,11 @@<br> local tap = require('tap')<br>-<br> -- Test file to demonstrate assertion after `string.char()`<br> -- recording.<br> -- See also, <a href="https://github.com/tarantool/tarantool/issues/6371" target="_blank">https://github.com/tarantool/tarantool/issues/6371</a>.<br>+local test = tap.test('gh-6371-string-char-no-arg'):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br>+})<br> <br>-local test = tap.test('gh-6371-string-char-no-arg')<br> -- XXX: Number of loop iterations.<br> -- * 1 -- instruction becomes hot.<br> -- * 2 -- recording of the loop body.<br>diff --git a/test/tarantool-tests/gh-6782-stitching-in-vmevent-handler.test.lua b/test/tarantool-tests/gh-6782-stitching-in-vmevent-handler.test.lua<br>index 6087e5ae..385e7648 100644<br>--- a/test/tarantool-tests/gh-6782-stitching-in-vmevent-handler.test.lua<br>+++ b/test/tarantool-tests/gh-6782-stitching-in-vmevent-handler.test.lua<br>@@ -1,9 +1,11 @@<br> local tap = require('tap')<br>-<br> -- Test file to demonstrate incorrect stitching behaviour<br> -- in vmevent handler.<br> -- See also <a href="https://github.com/tarantool/tarantool/issues/6782" target="_blank">https://github.com/tarantool/tarantool/issues/6782</a>.<br>-local test = tap.test('gh-6782-stitching-in-vmevent-handler')<br>+local test = tap.test('gh-6782-stitching-in-vmevent-handler'):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br>+})<br>+<br> test:plan(1)<br> <br> -- Just dump bytecodes is enough.<br>diff --git a/test/tarantool-tests/gh-6976-narrowing-of-unary-minus.test.lua b/test/tarantool-tests/gh-6976-narrowing-of-unary-minus.test.lua<br>index b4792f59..40387cca 100644<br>--- a/test/tarantool-tests/gh-6976-narrowing-of-unary-minus.test.lua<br>+++ b/test/tarantool-tests/gh-6976-narrowing-of-unary-minus.test.lua<br>@@ -1,5 +1,8 @@<br> local tap = require('tap')<br>-local test = tap.test('gh-6976-narrowing-of-unary-minus')<br>+local test = tap.test('gh-6976-narrowing-of-unary-minus'):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br>+})<br>+<br> test:plan(2)<br> <br> jit.opt.start('hotloop=1')<br>diff --git a/test/tarantool-tests/gh-7264-add-proto-trace-sysprof-default.test.lua b/test/tarantool-tests/gh-7264-add-proto-trace-sysprof-default.test.lua<br>index 472bc2d1..9cce32cb 100644<br>--- a/test/tarantool-tests/gh-7264-add-proto-trace-sysprof-default.test.lua<br>+++ b/test/tarantool-tests/gh-7264-add-proto-trace-sysprof-default.test.lua<br>@@ -1,5 +1,6 @@<br> local tap = require('tap')<br> local test = tap.test('gh-7264-add-proto-trace-sysprof-default'):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br> ['Sysprof is implemented for x86_64 only'] = jit.arch ~= 'x86' and<br> jit.arch ~= 'x64',<br> ['Sysprof is implemented for Linux only'] = jit.os ~= 'Linux',<br>diff --git a/test/tarantool-tests/lj-350-sload-typecheck.test.lua b/test/tarantool-tests/lj-350-sload-typecheck.test.lua<br>index 33794943..5b25864d 100644<br>--- a/test/tarantool-tests/lj-350-sload-typecheck.test.lua<br>+++ b/test/tarantool-tests/lj-350-sload-typecheck.test.lua<br>@@ -1,13 +1,15 @@<br> local tap = require('tap')<br>-local traceinfo = require('jit.util').traceinfo<br>-<br> -- Test file to demonstrate the incorrect GC64 JIT asembling<br> -- `IR_SLOAD`.<br> -- See also <a href="https://github.com/LuaJIT/LuaJIT/pull/350" target="_blank">https://github.com/LuaJIT/LuaJIT/pull/350</a>.<br>-local test = tap.test('lj-350-sload-typecheck')<br>+local test = tap.test('lj-350-sload-typecheck'):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br>+})<br> <br> test:plan(1)<br> <br>+local traceinfo = require('jit.util').traceinfo<br>+<br> -- Contains only IR_SLOAD after recording.<br> local function sload(arg)<br> return arg<br>diff --git a/test/tarantool-tests/lj-356-ir-khash-non-string-obj.test.lua b/test/tarantool-tests/lj-356-ir-khash-non-string-obj.test.lua<br>index 7f304183..9977205d 100644<br>--- a/test/tarantool-tests/lj-356-ir-khash-non-string-obj.test.lua<br>+++ b/test/tarantool-tests/lj-356-ir-khash-non-string-obj.test.lua<br>@@ -1,17 +1,20 @@<br> local tap = require('tap')<br>-local traceinfo = require('jit.util').traceinfo<br>-local table_new = require('table.new')<br>-<br> -- Test file to demonstrate the incorrect GC64 JIT behaviour<br> -- of an `IR_HREF` for the on-trace-constant key lookup.<br> -- See also <a href="https://github.com/LuaJIT/LuaJIT/pull/356" target="_blank">https://github.com/LuaJIT/LuaJIT/pull/356</a>.<br>-local test = tap.test('lj-356-ir-khash-non-string-obj')<br>+local test = tap.test('lj-356-ir-khash-non-string-obj'):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br>+})<br>+<br> local N_ITERATIONS = 4<br> <br> -- Amount of iteration for trace compilation and execution and<br> -- additional check, that there is no new trace compiled.<br> test:plan(N_ITERATIONS + 1)<br> <br>+local traceinfo = require('jit.util').traceinfo<br>+local table_new = require('table.new')<br>+<br> -- To reproduce the issue we need to compile a trace with<br> -- `IR_HREF`, with a lookup of constant hash key GC value. To<br> -- prevent an `IR_HREFK` to be emitted instead, we need a table<br>diff --git a/test/tarantool-tests/lj-357-arm64-hrefk.test.lua b/test/tarantool-tests/lj-357-arm64-hrefk.test.lua<br>index 8af9143a..d7e9c85e 100644<br>--- a/test/tarantool-tests/lj-357-arm64-hrefk.test.lua<br>+++ b/test/tarantool-tests/lj-357-arm64-hrefk.test.lua<br>@@ -1,9 +1,11 @@<br> local tap = require('tap')<br>-<br> -- Test file to demonstrate the incorrect JIT behaviour for HREFK<br> -- IR compilation on arm64.<br> -- See also <a href="https://github.com/LuaJIT/LuaJIT/issues/357" target="_blank">https://github.com/LuaJIT/LuaJIT/issues/357</a>.<br>-local test = tap.test('lj-357-arm64-hrefk')<br>+local test = tap.test('lj-357-arm64-hrefk'):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br>+})<br>+<br> test:plan(2)<br> <br> jit.opt.start('hotloop=1', 'hotexit=1')<br>diff --git a/test/tarantool-tests/lj-375-ir-bufput-signed-char.test.lua b/test/tarantool-tests/lj-375-ir-bufput-signed-char.test.lua<br>index 7c8df948..f600d898 100644<br>--- a/test/tarantool-tests/lj-375-ir-bufput-signed-char.test.lua<br>+++ b/test/tarantool-tests/lj-375-ir-bufput-signed-char.test.lua<br>@@ -1,6 +1,8 @@<br> local tap = require('tap')<br>+local test = tap.test('lj-375-ir-bufput-signed-char'):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br>+})<br> <br>-local test = tap.test('lj-375-ir-bufput-signed-char')<br> -- XXX: Number of loop iterations.<br> -- 1 -- instruction becomes hot<br> -- 2, 3 -- trace is recorded (considering loop recording<br>diff --git a/test/tarantool-tests/lj-408-tonumber-cdata-record.test.lua b/test/tarantool-tests/lj-408-tonumber-cdata-record.test.lua<br>index a8235e93..bdd0aaaa 100644<br>--- a/test/tarantool-tests/lj-408-tonumber-cdata-record.test.lua<br>+++ b/test/tarantool-tests/lj-408-tonumber-cdata-record.test.lua<br>@@ -1,18 +1,19 @@<br>-local ffi = require('ffi')<br> local tap = require('tap')<br>-<br> -- Test file to demonstrate the incorrect JIT recording for<br> -- `tonumber()` function with cdata argument for failed<br> -- conversions.<br> -- See also <a href="https://github.com/LuaJIT/LuaJIT/issues/408" target="_blank">https://github.com/LuaJIT/LuaJIT/issues/408</a>,<br> -- <a href="https://github.com/LuaJIT/LuaJIT/pull/412" target="_blank">https://github.com/LuaJIT/LuaJIT/pull/412</a>,<br> -- <a href="https://github.com/tarantool/tarantool/issues/7655" target="_blank">https://github.com/tarantool/tarantool/issues/7655</a>.<br>-local test = tap.test('lj-408-tonumber-cdata-record')<br>-<br>-local NULL = ffi.cast('void *', 0)<br>+local test = tap.test('lj-408-tonumber-cdata-record'):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br>+})<br> <br> test:plan(4)<br> <br>+local ffi = require('ffi')<br>+local NULL = ffi.cast('void *', 0)<br>+<br> local function check(x)<br> -- Don't use a tail call to avoid "leaving loop in root trace"<br> -- error, so the trace will be compiled.<br>diff --git a/test/tarantool-tests/lj-416-xor-before-jcc.test.lua b/test/tarantool-tests/lj-416-xor-before-jcc.test.lua<br>index f9a2a869..861114e8 100644<br>--- a/test/tarantool-tests/lj-416-xor-before-jcc.test.lua<br>+++ b/test/tarantool-tests/lj-416-xor-before-jcc.test.lua<br>@@ -1,7 +1,8 @@<br>-local ffi = require('ffi')<br> local tap = require('tap')<br>+local test = tap.test('lj-416-xor-before-jcc'):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br>+})<br> <br>-local test = tap.test('lj-416-xor-before-jcc')<br> test:plan(1)<br> <br> -- To reproduce this issue, we need:<br>@@ -30,6 +31,7 @@ test:plan(1)<br> -- ucomisd and the jnb, thereby causing the jnb to do the wrong<br> -- thing.<br> <br>+local ffi = require('ffi')<br> ffi.cdef[[<br> int test_xor_func(int a, int b, int c, int d, int e, int f, void * g, int h);<br> ]]<br>diff --git a/test/tarantool-tests/lj-430-maxirconst.test.lua b/test/tarantool-tests/lj-430-maxirconst.test.lua<br>index 633ab676..531acd7d 100644<br>--- a/test/tarantool-tests/lj-430-maxirconst.test.lua<br>+++ b/test/tarantool-tests/lj-430-maxirconst.test.lua<br>@@ -1,5 +1,6 @@<br> local tap = require('tap')<br> local test = tap.test('lj-430-maxirconst'):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br> ['Disabled on *BSD due to #4819'] = jit.os == 'BSD',<br> })<br> <br>diff --git a/test/tarantool-tests/lj-505-fold-no-strref-for-ptrdiff.test.lua b/test/tarantool-tests/lj-505-fold-no-strref-for-ptrdiff.test.lua<br>index 2866fb12..fec08b30 100644<br>--- a/test/tarantool-tests/lj-505-fold-no-strref-for-ptrdiff.test.lua<br>+++ b/test/tarantool-tests/lj-505-fold-no-strref-for-ptrdiff.test.lua<br>@@ -1,6 +1,8 @@<br> local tap = require('tap')<br>+local test = tap.test("lj-505-fold-icorrect-behavior"):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br>+})<br> <br>-local test = tap.test("lj-505-fold-icorrect-behavior")<br> test:plan(1)<br> <br> -- Test file to demonstrate Lua fold machinery icorrect behavior, details:<br>diff --git a/test/tarantool-tests/lj-524-fold-conv-respect-src-irt.test.lua b/test/tarantool-tests/lj-524-fold-conv-respect-src-irt.test.lua<br>index cd0f0f04..b2ccae63 100644<br>--- a/test/tarantool-tests/lj-524-fold-conv-respect-src-irt.test.lua<br>+++ b/test/tarantool-tests/lj-524-fold-conv-respect-src-irt.test.lua<br>@@ -1,9 +1,11 @@<br> local tap = require('tap')<br>-local ffi = require('ffi')<br>+local test = tap.test("or-524-fold-icorrect-behavior"):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br>+})<br> <br>-local test = tap.test("or-524-fold-icorrect-behavior")<br> test:plan(1)<br> <br>+local ffi = require('ffi')<br> -- Test file to demonstrate LuaJIT folding machinery incorrect behaviour,<br> -- details:<br> -- <a href="https://github.com/LuaJIT/LuaJIT/issues/524" target="_blank">https://github.com/LuaJIT/LuaJIT/issues/524</a><br>diff --git a/test/tarantool-tests/lj-556-fix-loop-realignment.test.lua b/test/tarantool-tests/lj-556-fix-loop-realignment.test.lua<br>index 6015f55f..b94bd3e9 100644<br>--- a/test/tarantool-tests/lj-556-fix-loop-realignment.test.lua<br>+++ b/test/tarantool-tests/lj-556-fix-loop-realignment.test.lua<br>@@ -1,6 +1,8 @@<br> local tap = require('tap')<br>+local test = tap.test('lj-556-fix-loop-realignment'):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br>+})<br> <br>-local test = tap.test('lj-556-fix-loop-realignment')<br> test:plan(1)<br> <br> -- Test file to demonstrate JIT misbehaviour for loop realignment<br>diff --git a/test/tarantool-tests/lj-584-bad-renames-for-sunk-values.test.lua b/test/tarantool-tests/lj-584-bad-renames-for-sunk-values.test.lua<br>index f037c898..e0c3e577 100644<br>--- a/test/tarantool-tests/lj-584-bad-renames-for-sunk-values.test.lua<br>+++ b/test/tarantool-tests/lj-584-bad-renames-for-sunk-values.test.lua<br>@@ -1,6 +1,8 @@<br> local tap = require('tap')<br>+local test = tap.test('lj-584-bad-renames-for-sunk-values'):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br>+})<br> <br>-local test = tap.test('lj-584-bad-renames-for-sunk-values')<br> test:plan(1)<br> <br> -- Test file to demonstrate LuaJIT assembler misbehaviour.<br>diff --git a/test/tarantool-tests/lj-603-err-snap-restore.test.lua b/test/tarantool-tests/lj-603-err-snap-restore.test.lua<br>index be54a5f3..6eb53dfd 100644<br>--- a/test/tarantool-tests/lj-603-err-snap-restore.test.lua<br>+++ b/test/tarantool-tests/lj-603-err-snap-restore.test.lua<br>@@ -40,6 +40,7 @@ recursive_f()<br> test:ok(true)<br> <br> test:skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br> ['Disabled on *BSD due to #4819'] = jit.os == 'BSD',<br> -- XXX: The different amount of stack slots is in-use for<br> -- Tarantool at start, so just skip test for it.<br>diff --git a/test/tarantool-tests/lj-672-cdata-allocation-recording.test.lua b/test/tarantool-tests/lj-672-cdata-allocation-recording.test.lua<br>index 2165afe3..1d6b19ba 100644<br>--- a/test/tarantool-tests/lj-672-cdata-allocation-recording.test.lua<br>+++ b/test/tarantool-tests/lj-672-cdata-allocation-recording.test.lua<br>@@ -1,5 +1,6 @@<br> local tap = require('tap')<br> local test = tap.test('lj-672-cdata-allocation-recording'):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br> ['Disabled on *BSD due to #4819'] = jit.os == 'BSD',<br> })<br> <br>diff --git a/test/tarantool-tests/lj-864-varg-rec-base-offset.test.lua b/test/tarantool-tests/lj-864-varg-rec-base-offset.test.lua<br>index d74c3c2b..d41e33ff 100644<br>--- a/test/tarantool-tests/lj-864-varg-rec-base-offset.test.lua<br>+++ b/test/tarantool-tests/lj-864-varg-rec-base-offset.test.lua<br>@@ -1,10 +1,12 @@<br> local tap = require('tap')<br>-<br> -- Test file to demonstrate LuaJIT misbehaviour during recording<br> -- BC_VARG with nvarargs >= nresults in GC64 mode.<br> -- See also <a href="https://github.com/LuaJIT/LuaJIT/issues/864" target="_blank">https://github.com/LuaJIT/LuaJIT/issues/864</a>,<br> -- <a href="https://github.com/tarantool/tarantool/issues/7172" target="_blank">https://github.com/tarantool/tarantool/issues/7172</a>.<br>-local test = tap.test('lj-864-varg-rec-base-offset')<br>+local test = tap.test('lj-864-varg-rec-base-offset'):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br>+})<br>+<br> test:plan(1)<br> <br> jit.opt.start('hotloop=1')<br>diff --git a/test/tarantool-tests/lj-flush-on-trace.test.lua b/test/tarantool-tests/lj-flush-on-trace.test.lua<br>index 099e9650..46db4d2a 100644<br>--- a/test/tarantool-tests/lj-flush-on-trace.test.lua<br>+++ b/test/tarantool-tests/lj-flush-on-trace.test.lua<br>@@ -1,5 +1,6 @@<br> local tap = require('tap')<br> local test = tap.test('lj-flush-on-trace'):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br> ['Disabled on *BSD due to #4819'] = jit.os == 'BSD',<br> })<br> <br>diff --git a/test/tarantool-tests/misclib-getmetrics-capi.test.lua b/test/tarantool-tests/misclib-getmetrics-capi.test.lua<br>index c5a91955..654e5545 100644<br>--- a/test/tarantool-tests/misclib-getmetrics-capi.test.lua<br>+++ b/test/tarantool-tests/misclib-getmetrics-capi.test.lua<br>@@ -1,5 +1,6 @@<br> local tap = require('tap')<br> local test = tap.test("clib-misc-getmetrics"):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br> ['Disabled on *BSD due to #4819'] = jit.os == 'BSD',<br> })<br> <br>diff --git a/test/tarantool-tests/misclib-getmetrics-lapi.test.lua b/test/tarantool-tests/misclib-getmetrics-lapi.test.lua<br>index e71bc239..881e717b 100644<br>--- a/test/tarantool-tests/misclib-getmetrics-lapi.test.lua<br>+++ b/test/tarantool-tests/misclib-getmetrics-lapi.test.lua<br>@@ -4,6 +4,7 @@<br> <br> local tap = require('tap')<br> local test = tap.test("lib-misc-getmetrics"):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br> ['Disabled on *BSD due to #4819'] = jit.os == 'BSD',<br> })<br> <br>diff --git a/test/tarantool-tests/misclib-memprof-lapi.test.lua b/test/tarantool-tests/misclib-memprof-lapi.test.lua<br>index 18c8aaab..4e413c88 100644<br>--- a/test/tarantool-tests/misclib-memprof-lapi.test.lua<br>+++ b/test/tarantool-tests/misclib-memprof-lapi.test.lua<br>@@ -1,8 +1,8 @@<br> -- XXX: This comment is a reminder to reimplement memprof tests<br> -- assertions to make them more indepentent to the changes made.<br>--- Now I just leave this 3 lines comment to preserve line numbers.<br> local tap = require("tap")<br> local test = tap.test("misc-memprof-lapi"):skipcond({<br>+ ['Test requires JIT enabled'] = not jit.status(),<br> ['Disabled on *BSD due to #4819'] = jit.os == 'BSD',<br> ["Memprof is implemented for x86_64 only"] = jit.arch ~= "x86" and<br> jit.arch ~= "x64",<br>diff --git a/test/tarantool-tests/misclib-sysprof-capi.test.lua b/test/tarantool-tests/misclib-sysprof-capi.test.lua<br>index a9b712a5..5c062195 100644<br>--- a/test/tarantool-tests/misclib-sysprof-capi.test.lua<br>+++ b/test/tarantool-tests/misclib-sysprof-capi.test.lua<br>@@ -9,9 +9,10 @@ test:plan(2)<br> <br> local testsysprof = require("testsysprof")<br> <br>-local jit = require('jit')<br>-<br> jit.off()<br>+-- XXX: Run JIT tuning functions in a safe frame to avoid errors<br>+-- thrown when LuaJIT is compiled with JIT engine disabled.<br>+pcall(jit.flush)<br> <br> test:ok(testsysprof.base())<br> test:ok(testsysprof.validation())<br>diff --git a/test/tarantool-tests/misclib-sysprof-lapi.test.lua b/test/tarantool-tests/misclib-sysprof-lapi.test.lua<br>index fff89dfd..96eaaab6 100644<br>--- a/test/tarantool-tests/misclib-sysprof-lapi.test.lua<br>+++ b/test/tarantool-tests/misclib-sysprof-lapi.test.lua<br>@@ -8,7 +8,9 @@ local test = tap.test("misc-sysprof-lapi"):skipcond({<br> test:plan(19)<br> <br> jit.off()<br>-jit.flush()<br>+-- XXX: Run JIT tuning functions in a safe frame to avoid errors<br>+-- thrown when LuaJIT is compiled with JIT engine disabled.<br>+pcall(jit.flush)<br> <br> local bufread = require("utils.bufread")<br> local symtab = require("utils.symtab")<br>@@ -127,5 +129,4 @@ check_mode("C", 100)<br> <br> os.remove(TMP_BINFILE)<br> <br>-jit.on()<br> os.exit(test:check() and 0 or 1)<br>--<br>2.30.2</div></div></div></div></blockquote><div> </div></div></blockquote></BODY></HTML>