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 BD9E0257FF9; Mon, 13 Feb 2023 20:06:30 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org BD9E0257FF9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1676307990; bh=CxzoD7oLmiPXTL4LKaY+3+6Ub42fjzDk0RU6jSr6LPI=; 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=Q2s20aEjN7elW98oHA5dJlgd4buQoxMtZg/pUuw67ikEHORZhtW/Wwom836Fwbydr iBYlzYo0MgMHqtuExYPpiIDB0qK1Uc329TbjLh841TSPcwxWN/r6A+/rbEIK+WIpAU 4tX2BmTw9CPzbE6/D/nLuesit7PcbOfROZJlyZiE= Received: from smtp46.i.mail.ru (smtp46.i.mail.ru [95.163.41.84]) (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 22760257FFA for ; Mon, 13 Feb 2023 20:03:33 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 22760257FFA Received: by smtp46.i.mail.ru with esmtpa (envelope-from ) id 1pRcEm-00Ft6R-9o; Mon, 13 Feb 2023 20:03:32 +0300 To: Sergey Kaplun , Maxim Kokryashkin Date: Mon, 13 Feb 2023 17:02:48 +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: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9806C989EC2150E337603B3C124283E76FFD74A77C9EEF150182A05F5380850408321F004DBCD07C019303AB149D289B542E9DAC108066B55225C0DC8B83DC503 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE737BB76880A4CA9A4EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006375448D590B04CE87D8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8BDC19AB942CB9D3161DEF1DC55311AB8117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC93A51A5089774A2DA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F44604297287769387670735209647ADFADE5905B1F04B652EEC242312D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EEFAD5A440E159F97D4AAC223A686B1DECD8FC6C240DEA7642DBF02ECDB25306B2B78CF848AE20165D0A6AB1C7CE11FEE3E3786DD2C77EBDAA302FCEF25BFAB345C4224003CC836476E2F48590F00D11D6E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F7900637FB177F6A8366F17BEFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-C1DE0DAB: 0D63561A33F958A5EBE1646AF3F32417A59A189A3A238BDC41E8DFF7B68323144EAF44D9B582CE87C8A4C02DF684249CC203C45FEA855C8F X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D348B409C2D257583DF2D59324421758F0BFC817BFA6F1E4CC172C142CCCE55B7297ACFB4E93D715B4D1D7E09C32AA3244CD10D2900D702E7740CD504E05044C524C3B3ADDA61883BB5927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojgB/I+mAIlFFBQ7mtRwZbUQ== X-Mailru-Sender: 2FEBA92C8E508479FE7B9A1DF348D531626392C2CE6982C604371EA399A2875276BB73B02BC099292326FE6F2A341ACE0FB9F97486540B4CD9E8847AB8CFED4D9ABF8A61C016C2CFB0DAF586E7D11B3E67EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit 6/7] 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 consider whether JIT is enabled or not in scope of 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 build without compiler support. So if yields false, the latter case is considered. The condition is fixed to differ both aforementioned cases the following way: when yields only compiler status with no flags listing, LuaJIT is built without compiler; if there is more than one value returned, JIT support is on aboard. 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..0aa5d367 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 = select('#', jit.status()) > 1 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..e3b6c7a8 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 = select('#', jit.status()) > 1 local has_jutil = pcall(require, 'jit.util') local has_openresty_listing = profile.openresty or jit.version:match'moonjit' -- 2.30.2