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 5421B3048D2; Tue, 28 Feb 2023 22:05:42 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 5421B3048D2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1677611142; bh=ASdl0Q/1v7glYgIaSSYM5YWLV1N2rVwRkrefby6ZTZM=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=d0LsE4YTzoe2Ur5GzXfn8I3kYINXROQue7Z7X4bhOxpzYbHVkXIQD7X/kZYTGyfDJ RLqPZfFd1vfP7F0bjfLx3mfX0gMYx8v8q3Fyc69dJJM6L9s7u4b1Fg6hVvPhkH6Ts0 rHbsga5QPerKiO9XWvo8iVY2heeWpRU2XUZFOldA= Received: from smtp32.i.mail.ru (smtp32.i.mail.ru [95.163.41.73]) (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 EC4902D95FB for ; Tue, 28 Feb 2023 22:03:42 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org EC4902D95FB Received: by smtp32.i.mail.ru with esmtpa (envelope-from ) id 1pX5GH-000qWR-R7; Tue, 28 Feb 2023 22:03:42 +0300 To: Sergey Kaplun , Maxim Kokryashkin Date: Tue, 28 Feb 2023 19:00:47 +0000 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD94A31EA4B0797EF2E66A9B0105867A2854E8BB04902C74F6E182A05F5380850404C228DA9ACA6FE2735805722BE5D03DE9698265873D0F9CC41782C591BC158801A6FA2971E3AA52A X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7F5B0FEFE70B13B25EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006370EBB47D88F71BB738638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8723E60CDA8EE895F42EC5347F38E864C117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF80095D1E37F4578A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F4460429728776938767073520CCD848CCB6FE560CF04B652EEC242312D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EE41BF15D38FB6CB3AFCE65BE3358055BDD8FC6C240DEA7642DBF02ECDB25306B2B78CF848AE20165D0A6AB1C7CE11FEE3E3786DD2C77EBDAAC0837EA9F3D19764C4224003CC836476E2F48590F00D11D6E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F7900637A7EFCB0EB5ACB161EFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-C1DE0DAB: 0D63561A33F958A5B261C288EF6DEBA67E9A1CA50CC155C83F09C2D5133073424EAF44D9B582CE87C8A4C02DF684249CC203C45FEA855C8F X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3441661D6226BE8C312E174CBD868A4D038E1B9A1CDAADC9188B6F7F72556F3B4F83683994A8F336D01D7E09C32AA3244C1318FC190E197D1FE484A44C5A3878B0F94338140B71B8EE927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojMN6DA1mNzI8BWAvPPpODXA== X-Mailru-Sender: 2FEBA92C8E508479FE7B9A1DF348D531D395CDE6305F6E738EC1472896A038A017145C81ACD5963F2326FE6F2A341ACE0FB9F97486540B4CD9E8847AB8CFED4D9ABF8A61C016C2CFB0DAF586E7D11B3E67EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit v2 4/5] test: fix lua-Harness 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: Igor Munkin via Tarantool-patches Reply-To: Igor Munkin Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" 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 yields false for both cases, when JIT is just turned off and when LuaJIT is built without compiler support. So, if 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 --- 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") end -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") end -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' -- 2.30.2