From: Sergey Kaplun via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: Igor Munkin <imun@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: Re: [Tarantool-patches] [PATCH luajit v2 3/5] test: add skipcond for all JIT-related tests
Date: Wed, 1 Mar 2023 13:04:06 +0300 [thread overview]
Message-ID: <Y/8jFhT+AkqW2EDs@root> (raw)
In-Reply-To: <d78d1765dd1c87d4f81ebee5271fb45e5a34c94b.1677607479.git.imun@tarantool.org>
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
>
> 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(-)
>
> diff --git a/test/tarantool-tests/bc-jit-unpatching.test.lua b/test/tarantool-tests/bc-jit-unpatching.test.lua
> index 71247f0c..2c3b7c9a 100644
> --- a/test/tarantool-tests/bc-jit-unpatching.test.lua
> +++ b/test/tarantool-tests/bc-jit-unpatching.test.lua
<snipped>
> diff --git a/test/tarantool-tests/fix-fold-simplify-conv-sext.test.lua b/test/tarantool-tests/fix-fold-simplify-conv-sext.test.lua
> index 07e22c36..60eb3e7c 100644
> --- a/test/tarantool-tests/fix-fold-simplify-conv-sext.test.lua
> +++ b/test/tarantool-tests/fix-fold-simplify-conv-sext.test.lua
<snipped>
> 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
> index 8df72ec4..6161747f 100644
> --- a/test/tarantool-tests/fix-slot-check-for-mm-record.test.lua
> +++ b/test/tarantool-tests/fix-slot-check-for-mm-record.test.lua
<snipped>
> diff --git a/test/tarantool-tests/gh-4199-gc64-fuse.test.lua b/test/tarantool-tests/gh-4199-gc64-fuse.test.lua
> index 65f9faac..4513d43b 100644
> --- a/test/tarantool-tests/gh-4199-gc64-fuse.test.lua
> +++ b/test/tarantool-tests/gh-4199-gc64-fuse.test.lua
<snipped>
> diff --git a/test/tarantool-tests/gh-4427-ffi-sandwich.test.lua b/test/tarantool-tests/gh-4427-ffi-sandwich.test.lua
> index ed3f50d1..86544196 100644
> --- a/test/tarantool-tests/gh-4427-ffi-sandwich.test.lua
> +++ b/test/tarantool-tests/gh-4427-ffi-sandwich.test.lua
<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.
> + ['Test requires JIT enabled'] = not jit.status(),
> +})
>
> -local test = tap.test("gh-4476-fix-string-find-recording")
> test:plan(1)
>
> local err = [[module 'kit.1.10.3-136' not found:
> 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
> index 3c6833fc..9f2c5f85 100644
> --- a/test/tarantool-tests/gh-5813-resolving-of-c-symbols.test.lua
> +++ b/test/tarantool-tests/gh-5813-resolving-of-c-symbols.test.lua
<snipped>
> 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
> index 7110e351..5d7fd7e2 100644
> --- a/test/tarantool-tests/gh-6065-jit-library-smoke-tests.test.lua
> +++ b/test/tarantool-tests/gh-6065-jit-library-smoke-tests.test.lua
<snipped>
> 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
> index 4dcf3e22..cfcc6adb 100644
> --- 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
<snipped>
> diff --git a/test/tarantool-tests/gh-6189-cur_L.test.lua b/test/tarantool-tests/gh-6189-cur_L.test.lua
> index 7f2184ec..a5096a7c 100644
> --- a/test/tarantool-tests/gh-6189-cur_L.test.lua
> +++ b/test/tarantool-tests/gh-6189-cur_L.test.lua
<snipped>
> 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
> index 9788923a..da399bcf 100644
> --- a/test/tarantool-tests/gh-6227-bytecode-allocator-for-comparisons.test.lua
> +++ b/test/tarantool-tests/gh-6227-bytecode-allocator-for-comparisons.test.lua
<snipped>
> 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
> index ec871d19..90121860 100644
> --- a/test/tarantool-tests/gh-6371-string-char-no-arg.test.lua
> +++ b/test/tarantool-tests/gh-6371-string-char-no-arg.test.lua
<snipped>
> 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
> index 6087e5ae..385e7648 100644
> --- a/test/tarantool-tests/gh-6782-stitching-in-vmevent-handler.test.lua
> +++ b/test/tarantool-tests/gh-6782-stitching-in-vmevent-handler.test.lua
<snipped>
> 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
> index b4792f59..40387cca 100644
> --- a/test/tarantool-tests/gh-6976-narrowing-of-unary-minus.test.lua
> +++ b/test/tarantool-tests/gh-6976-narrowing-of-unary-minus.test.lua
<snipped>
> 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
> index 472bc2d1..9cce32cb 100644
> --- 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
<snipped>
> diff --git a/test/tarantool-tests/lj-350-sload-typecheck.test.lua b/test/tarantool-tests/lj-350-sload-typecheck.test.lua
> index 33794943..5b25864d 100644
> --- a/test/tarantool-tests/lj-350-sload-typecheck.test.lua
> +++ b/test/tarantool-tests/lj-350-sload-typecheck.test.lua
<snipped>
> 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
> index 7f304183..9977205d 100644
> --- 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
<snipped>
> diff --git a/test/tarantool-tests/lj-357-arm64-hrefk.test.lua b/test/tarantool-tests/lj-357-arm64-hrefk.test.lua
> index 8af9143a..d7e9c85e 100644
> --- a/test/tarantool-tests/lj-357-arm64-hrefk.test.lua
> +++ b/test/tarantool-tests/lj-357-arm64-hrefk.test.lua
<snipped>
> 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
> index 7c8df948..f600d898 100644
> --- a/test/tarantool-tests/lj-375-ir-bufput-signed-char.test.lua
> +++ b/test/tarantool-tests/lj-375-ir-bufput-signed-char.test.lua
> @@ -1,6 +1,8 @@
<snipped>
> diff --git a/test/tarantool-tests/lj-408-tonumber-cdata-record.test.lua b/test/tarantool-tests/lj-408-tonumber-cdata-record.test.lua
> index a8235e93..bdd0aaaa 100644
> --- a/test/tarantool-tests/lj-408-tonumber-cdata-record.test.lua
> +++ b/test/tarantool-tests/lj-408-tonumber-cdata-record.test.lua
<snipped>
> diff --git a/test/tarantool-tests/lj-416-xor-before-jcc.test.lua b/test/tarantool-tests/lj-416-xor-before-jcc.test.lua
> index f9a2a869..861114e8 100644
> --- a/test/tarantool-tests/lj-416-xor-before-jcc.test.lua
> +++ b/test/tarantool-tests/lj-416-xor-before-jcc.test.lua
<snipped>
> diff --git a/test/tarantool-tests/lj-430-maxirconst.test.lua b/test/tarantool-tests/lj-430-maxirconst.test.lua
> index 633ab676..531acd7d 100644
> --- a/test/tarantool-tests/lj-430-maxirconst.test.lua
> +++ b/test/tarantool-tests/lj-430-maxirconst.test.lua
<snipped>
> 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
> index 2866fb12..fec08b30 100644
> --- 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
<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.
> + ['Test requires JIT enabled'] = not jit.status(),
> +})
>
> -local test = tap.test("or-524-fold-icorrect-behavior")
> test:plan(1)
>
> +local ffi = require('ffi')
> -- Test file to demonstrate LuaJIT folding machinery incorrect behaviour,
> -- details:
> -- https://github.com/LuaJIT/LuaJIT/issues/524
> diff --git a/test/tarantool-tests/lj-556-fix-loop-realignment.test.lua b/test/tarantool-tests/lj-556-fix-loop-realignment.test.lua
> index 6015f55f..b94bd3e9 100644
> --- a/test/tarantool-tests/lj-556-fix-loop-realignment.test.lua
> +++ b/test/tarantool-tests/lj-556-fix-loop-realignment.test.lua
<snipped>
> 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
> index f037c898..e0c3e577 100644
> --- 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
<snipped>
> diff --git a/test/tarantool-tests/lj-603-err-snap-restore.test.lua b/test/tarantool-tests/lj-603-err-snap-restore.test.lua
> index be54a5f3..6eb53dfd 100644
> --- a/test/tarantool-tests/lj-603-err-snap-restore.test.lua
> +++ b/test/tarantool-tests/lj-603-err-snap-restore.test.lua
<snipped>
> diff --git a/test/tarantool-tests/lj-672-cdata-allocation-recording.test.lua b/test/tarantool-tests/lj-672-cdata-allocation-recording.test.lua
> index 2165afe3..1d6b19ba 100644
> --- a/test/tarantool-tests/lj-672-cdata-allocation-recording.test.lua
> +++ b/test/tarantool-tests/lj-672-cdata-allocation-recording.test.lua
<snipped>
> 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
> index d74c3c2b..d41e33ff 100644
> --- a/test/tarantool-tests/lj-864-varg-rec-base-offset.test.lua
> +++ b/test/tarantool-tests/lj-864-varg-rec-base-offset.test.lua
<snipped>
> diff --git a/test/tarantool-tests/lj-flush-on-trace.test.lua b/test/tarantool-tests/lj-flush-on-trace.test.lua
> index 099e9650..46db4d2a 100644
> --- a/test/tarantool-tests/lj-flush-on-trace.test.lua
> +++ b/test/tarantool-tests/lj-flush-on-trace.test.lua
<snipped>
> diff --git a/test/tarantool-tests/misclib-getmetrics-capi.test.lua b/test/tarantool-tests/misclib-getmetrics-capi.test.lua
> index c5a91955..654e5545 100644
> --- a/test/tarantool-tests/misclib-getmetrics-capi.test.lua
> +++ b/test/tarantool-tests/misclib-getmetrics-capi.test.lua
<snipped>
> diff --git a/test/tarantool-tests/misclib-getmetrics-lapi.test.lua b/test/tarantool-tests/misclib-getmetrics-lapi.test.lua
> index e71bc239..881e717b 100644
> --- a/test/tarantool-tests/misclib-getmetrics-lapi.test.lua
> +++ b/test/tarantool-tests/misclib-getmetrics-lapi.test.lua
<snipped>
> diff --git a/test/tarantool-tests/misclib-memprof-lapi.test.lua b/test/tarantool-tests/misclib-memprof-lapi.test.lua
> index 18c8aaab..4e413c88 100644
> --- a/test/tarantool-tests/misclib-memprof-lapi.test.lua
> +++ b/test/tarantool-tests/misclib-memprof-lapi.test.lua
<snipped>
> diff --git a/test/tarantool-tests/misclib-sysprof-capi.test.lua b/test/tarantool-tests/misclib-sysprof-capi.test.lua
> index a9b712a5..5c062195 100644
> --- a/test/tarantool-tests/misclib-sysprof-capi.test.lua
> +++ b/test/tarantool-tests/misclib-sysprof-capi.test.lua
<snipped>
> diff --git a/test/tarantool-tests/misclib-sysprof-lapi.test.lua b/test/tarantool-tests/misclib-sysprof-lapi.test.lua
> index fff89dfd..96eaaab6 100644
> --- a/test/tarantool-tests/misclib-sysprof-lapi.test.lua
> +++ b/test/tarantool-tests/misclib-sysprof-lapi.test.lua
<snipped>
> --
> 2.30.2
>
--
Best regards,
Sergey Kaplun
next prev parent reply other threads:[~2023-03-01 10:07 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-28 19:00 [Tarantool-patches] [PATCH luajit v2 0/5] Adjust tests to be run when JIT is disabled Igor Munkin via Tarantool-patches
2023-02-28 19:00 ` [Tarantool-patches] [PATCH luajit v2 1/5] Minor fixes Igor Munkin via Tarantool-patches
2023-03-01 19:25 ` Maxim Kokryashkin via Tarantool-patches
2023-02-28 19:00 ` [Tarantool-patches] [PATCH luajit v2 2/5] build: fix build with JIT disabled Igor Munkin via Tarantool-patches
2023-03-01 19:27 ` Maxim Kokryashkin via Tarantool-patches
2023-03-02 15:52 ` Igor Munkin via Tarantool-patches
2023-02-28 19:00 ` [Tarantool-patches] [PATCH luajit v2 3/5] test: add skipcond for all JIT-related tests Igor Munkin via Tarantool-patches
2023-03-01 10:04 ` Sergey Kaplun via Tarantool-patches [this message]
2023-03-02 16:42 ` Igor Munkin via Tarantool-patches
2023-03-01 19:28 ` Maxim Kokryashkin via Tarantool-patches
2023-02-28 19:00 ` [Tarantool-patches] [PATCH luajit v2 4/5] test: fix lua-Harness " Igor Munkin via Tarantool-patches
2023-03-01 10:08 ` Sergey Kaplun via Tarantool-patches
2023-03-01 19:30 ` Maxim Kokryashkin via Tarantool-patches
2023-02-28 19:00 ` [Tarantool-patches] [PATCH luajit v2 5/5] ci: add nojit flavor for exotic builds Igor Munkin via Tarantool-patches
2023-03-01 19:30 ` Maxim Kokryashkin 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=Y/8jFhT+AkqW2EDs@root \
--to=tarantool-patches@dev.tarantool.org \
--cc=imun@tarantool.org \
--cc=skaplun@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH luajit v2 3/5] test: add skipcond for all JIT-related tests' \
/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