Re: [Tarantool-patches] [PATCH luajit v2 3/5] test: add skipcond for all JIT-related tests

[Igor Munkin via Tarantool-patches <tarantool-patches@dev.tarantool.org>]

Sergey,

Thanks for your review! See my replies below.

On 01.03.23, Sergey Kaplun wrote:
> Hi, Igor!
> Thanks for the patch!
> LGTM, with minnor suggestions below.
> 
> On 28.02.23, Igor Munkin wrote:
> > This patch adjusts all tests for JIT engine to avoid failures when JIT
> > is disabled, so skipcond with the result of <jit.status> as a condition
> > is added to handle this.
> 
> I see some additional `pcall`-s here for `jit.flush()`, etc..
> I suggest the following commit message naming to be consistent with the
> next patch ("test: fix lua-Harness JIT-related tests"):
> | test: fix tarantool JIT-related tests

OK, here is the new commit message:
| test: adjust JIT-related tests in tarantool-tests
|
| This patch adjusts all tests for JIT engine to avoid failures when JIT
| is disabled, so skipcond with the result of <jit.status> as a condition
| is added to handle this.
|
| Furthermore, all tests explicitly that explicitly disable JIT for its
| purpose, are also adjusted by wrapping <jit.flush> calls with <pcall>.
|
| Part of tarantool/tarantool#8252

> 
> > 
> > Part of tarantool/tarantool#8252
> > 
> > Signed-off-by: Igor Munkin <imun@tarantool.org>
> > ---
> >  test/tarantool-tests/bc-jit-unpatching.test.lua       |  6 ++++--
> >  .../fix-fold-simplify-conv-sext.test.lua              |  7 ++++---
> >  .../fix-slot-check-for-mm-record.test.lua             |  4 +++-
> >  test/tarantool-tests/gh-4199-gc64-fuse.test.lua       |  1 +
> >  test/tarantool-tests/gh-4427-ffi-sandwich.test.lua    |  1 +
> >  .../gh-4476-fix-string-find-recording.test.lua        |  4 +++-
> >  .../gh-5813-resolving-of-c-symbols.test.lua           |  4 +++-
> >  .../gh-6065-jit-library-smoke-tests.test.lua          |  4 +++-
> >  .../gh-6098-fix-side-exit-patching-on-arm64.test.lua  |  5 ++++-
> >  test/tarantool-tests/gh-6189-cur_L.test.lua           |  7 +++++--
> >  ...h-6227-bytecode-allocator-for-comparisons.test.lua |  5 ++++-
> >  .../gh-6371-string-char-no-arg.test.lua               |  5 +++--
> >  .../gh-6782-stitching-in-vmevent-handler.test.lua     |  6 ++++--
> >  .../gh-6976-narrowing-of-unary-minus.test.lua         |  5 ++++-
> >  .../gh-7264-add-proto-trace-sysprof-default.test.lua  |  1 +
> >  test/tarantool-tests/lj-350-sload-typecheck.test.lua  |  8 +++++---
> >  .../lj-356-ir-khash-non-string-obj.test.lua           | 11 +++++++----
> >  test/tarantool-tests/lj-357-arm64-hrefk.test.lua      |  6 ++++--
> >  .../lj-375-ir-bufput-signed-char.test.lua             |  4 +++-
> >  .../lj-408-tonumber-cdata-record.test.lua             | 11 ++++++-----
> >  test/tarantool-tests/lj-416-xor-before-jcc.test.lua   |  6 ++++--
> >  test/tarantool-tests/lj-430-maxirconst.test.lua       |  1 +
> >  .../lj-505-fold-no-strref-for-ptrdiff.test.lua        |  4 +++-
> >  .../lj-524-fold-conv-respect-src-irt.test.lua         |  6 ++++--
> >  .../lj-556-fix-loop-realignment.test.lua              |  4 +++-
> >  .../lj-584-bad-renames-for-sunk-values.test.lua       |  4 +++-
> >  test/tarantool-tests/lj-603-err-snap-restore.test.lua |  1 +
> >  .../lj-672-cdata-allocation-recording.test.lua        |  1 +
> >  .../lj-864-varg-rec-base-offset.test.lua              |  6 ++++--
> >  test/tarantool-tests/lj-flush-on-trace.test.lua       |  1 +
> >  test/tarantool-tests/misclib-getmetrics-capi.test.lua |  1 +
> >  test/tarantool-tests/misclib-getmetrics-lapi.test.lua |  1 +
> >  test/tarantool-tests/misclib-memprof-lapi.test.lua    |  2 +-
> >  test/tarantool-tests/misclib-sysprof-capi.test.lua    |  5 +++--
> >  test/tarantool-tests/misclib-sysprof-lapi.test.lua    |  5 +++--
> >  35 files changed, 106 insertions(+), 47 deletions(-)
> > 

<snipped>

> > 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
> > index f48af173..0758b38f 100644
> > --- a/test/tarantool-tests/gh-4476-fix-string-find-recording.test.lua
> > +++ b/test/tarantool-tests/gh-4476-fix-string-find-recording.test.lua
> > @@ -1,6 +1,8 @@
> >  local tap = require('tap')
> > +local test = tap.test("gh-4476-fix-string-find-recording"):skipcond({
> 
> Minor: I suggest to use single quotes here according to our code style
> for tests. This file is using mixed style, so it will be minor
> improvement of the situation.

Fixed.

> 
> > +  ['Test requires JIT enabled'] = not jit.status(),
> > +})
> >  
> > -local test = tap.test("gh-4476-fix-string-find-recording")

<snipped>

> > 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
> > index cd0f0f04..b2ccae63 100644
> > --- 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
> > @@ -1,9 +1,11 @@
> >  local tap = require('tap')
> > -local ffi = require('ffi')
> > +local test = tap.test("or-524-fold-icorrect-behavior"):skipcond({
> 
> Minor: I suggest to use single quotes here according to our code style
> for tests. This file is using mixed style, so it will be minor
> improvement of the situation.

Fixed.

> 
> > +  ['Test requires JIT enabled'] = not jit.status(),
> > +})
> >  
> > -local test = tap.test("or-524-fold-icorrect-behavior")

<snipped>

> > -- 
> > 2.30.2
> > 
> 
> -- 
> Best regards,
> Sergey Kaplun

-- 
Best regards,
IM