From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 9EE2B2BCBEF; Wed, 1 Mar 2023 13:07:46 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 9EE2B2BCBEF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1677665266; bh=ZxGqYAc/mBnf67JJQuJFI+cqb8HH5Rz/bqJ115Cr2Fw=; h=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=cPqIQXAycws8xwuBsFoceu+gWt2JorHpc1QVgWxKQIwCyUM+wfy7WMvgNj4fMJ4gv tc8YT62VGWAU1zV51vXs+mwFDvV04Cef+ulH2Nc+iJD46RDG1DabI9n3/JK368taCG 7aiHDY2vsEu0bC0h1uwK3OkrR4HZlxsHgjJ7Bseo= Received: from smtpng1.i.mail.ru (smtpng1.i.mail.ru [94.100.181.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 245BA6FCB0 for ; Wed, 1 Mar 2023 13:07:45 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 245BA6FCB0 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1pXJNA-0000Dq-0l; Wed, 01 Mar 2023 13:07:44 +0300 Date: Wed, 1 Mar 2023 13:04:06 +0300 To: Igor Munkin Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9CCAB0EF48C080D7061D147BFFC34EDFD7E7D307E9D552FFA182A05F538085040EC7894CE4A3219CFDA8B4FBD0C2FA4C27B662070B23D26B3350C73393DEDF434 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE744EF50CE3D43278BEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006370E5D717DF121F99E8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D82B9237FEC853259265FA404DD74A17E6117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCC64BFC3B5CB3D1D1A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F44604297287769387670735209647ADFADE5905B1C26CFBAC0749D213D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B613439FA09F3DCB32089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34D9DC20663B80603FAE0A0DABFB7070D8774CD390B96FF0FA4C0783641E7E25F9937BFEE9EB03DCA21D7E09C32AA3244C156F8FFAC0B5A31CE80FD6E446DFF9FB250262A5EE9971B0FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojMN6DA1mNzI8r9OK5OEX3Iw== X-DA7885C5: 9389DF59A4F62591B1D58F15575B3A1F28E0E39880F57A31DF8A8D241DA5461F262E2D401490A4A0DB037EFA58388B346E8BC1A9835FDE71 X-Mailru-Sender: 689FA8AB762F73933AF1F914F131DBF504294B70B04B2E23ACD00012CD8D4B7C0FBE9A32752B8C9C2AA642CC12EC09F1FB559BB5D741EB962F61BD320559CF1EFD657A8799238ED55FEEDEB644C299C0ED14614B50AE0675 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit v2 3/5] test: add skipcond for all JIT-related tests X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Sergey Kaplun via Tarantool-patches Reply-To: Sergey Kaplun Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" 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 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 > --- > 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 > 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 > 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 > 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 > 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 > 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 > 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 > 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 > 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 > 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 > 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 > 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 > 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 > 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 > 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 > 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 > 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 > 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 @@ > 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 > 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 > 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 > 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 > 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 > 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 > 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 > 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 > 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 > 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 > 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 > 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 > 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 > 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 > 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 > -- > 2.30.2 > -- Best regards, Sergey Kaplun