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 ED405A50FC1; Sun, 25 Feb 2024 13:55:03 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org ED405A50FC1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1708858504; bh=EZr5EsDum8pBcUTCUvvlOpxIlRX30WAWZXLQnBZOXuI=; 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=uSnSlv99u/3V3oNDbzbVxLq8hH5ijs5G195dRdpcABbsyFww8FoNSBWEYV4no3puR exlKLDtY105AnPfk8oXFI4chKcXD8obr9UfKJ2DsIErnuXlbP39E2DepmXhOY/w1cz t5ToCR7ow4eraOqP3Jy/nlCT9kktUU4ZLJ5tTKjQ= Received: from smtp63.i.mail.ru (smtp63.i.mail.ru [95.163.41.100]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id CF886A4987C for ; Sun, 25 Feb 2024 13:54:02 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org CF886A4987C Received: by smtp63.i.mail.ru with esmtpa (envelope-from ) id 1reC8v-00000002LRd-22wK; Sun, 25 Feb 2024 13:54:01 +0300 To: Maxim Kokryashkin , Sergey Kaplun Date: Sun, 25 Feb 2024 10:41:07 +0000 Message-Id: <3e891e97ae52ea897bdd4d7d7c8cc18a5335a687.1708856482.git.imun@tarantool.org> X-Mailer: git-send-email 2.39.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: 4F1203BC0FB41BD90B4B6FE9E606E4964B11B31777E776BDE203E8B3C1EA427300894C459B0CD1B9B307C35FC32549342AD5C4874F525AA32A93CADBB1E2770BE9D26329E21FC6A5750FC9643A608EC1 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7A548C5E803E75135EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006370FDF1CE57EA9D07C8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D828685A72D5A51F3407D0DABCA651DED9AED449D4D4930CD9CC7F00164DA146DAFE8445B8C89999728AA50765F7900637A359038F01FFAF82389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC80A9EC8C3488E7643F6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947C6A1CB4668A9CA5FAAD7EC71F1DB884274AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C3056D5A8E4C6B598EBA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CFED8438A78DFE0A9E1DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C30584FF81F342DA0735872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-C1DE0DAB: 0D63561A33F958A5568E9AC5BB7CF33E5002B1117B3ED6961275F1BDCD8FDFA1AD0703CEB2EF9A27823CB91A9FED034534781492E4B8EEAD21D4E6D365FE45D1C79554A2A72441328621D336A7BC284946AD531847A6065A535571D14F44ED41 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CFAF923F97ADFC8F138EBA56A5DCDD9DB3C996A23CE33C8F9A72B20EA65943C89D9FECE8BBF8D52592A653534C7294CACCFEDED8D1C65AE9E25852327424993501D5A9B7456AE1FF64C226CC413062362A913E6812662D5F2A74A26541E23E71317A83BD0C44CE203720ABEDE4BBDD9CDD X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojhcsd5OwWmoj3/3DcXr8zWg== X-Mailru-Sender: 2FEBA92C8E508479FE7B9A1DF348D5310D1A11ACD1E4B27A6750B362712FA5BD037C9CC22C0DF06F9929EC5BE1313555F5EE5212A79745119D086FC03DADA47A24EDF3BD9585A06DEEABBE9EE6587A054198E0F3ECE9B5443453F38A29522196 X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit 2/2] test: enable CLI-related lua-Harness tests back 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" Tarantool supports -b and -j options to use LuaJIT modules since the commit bf8b76a4dfc9dd62d4131e90e2ae5d83843b6630 ("lua: proxy -j and -b flags"), so 241-standalone.t and 411-luajit.t tests in lua-Harness suite, disabled in the commit 39a4db500db2619359c2c9474be016360252060d ("test: support Tarantool in lua-Harness"), can be enabled back. However, -O options is still not implemented in Tarantool, so the related part in 411-luajit.t test chunk is still disabled. Follows up #5541 Signed-off-by: Igor Munkin --- test/lua-Harness-tests/241-standalone.t | 2 +- test/lua-Harness-tests/411-luajit.t | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test/lua-Harness-tests/241-standalone.t b/test/lua-Harness-tests/241-standalone.t index 5b353491..aa011d3b 100755 --- a/test/lua-Harness-tests/241-standalone.t +++ b/test/lua-Harness-tests/241-standalone.t @@ -29,7 +29,7 @@ L --]] require'test_assertion' -local has_bytecode = not ujit and not ravi and not _TARANTOOL +local has_bytecode = not ujit and not ravi local has_error52 = _VERSION >= 'Lua 5.2' local has_error53 = _VERSION >= 'Lua 5.3' local has_opt_E = _VERSION >= 'Lua 5.2' or (jit and not _TARANTOOL) diff --git a/test/lua-Harness-tests/411-luajit.t b/test/lua-Harness-tests/411-luajit.t index 1b2da729..414e6a57 100755 --- a/test/lua-Harness-tests/411-luajit.t +++ b/test/lua-Harness-tests/411-luajit.t @@ -27,7 +27,7 @@ See L require'test_assertion' local profile = require'profile' -if not jit or ujit or _TARANTOOL then +if not jit or ujit then skip_all("only with LuaJIT") end @@ -176,7 +176,9 @@ f = io.popen(cmd) matches(f:read'*l', errbuild("unknown luaJIT command or jit%.%* modules not installed"), "-j bad") f:close() -if compiled_with_jit then +if _TARANTOOL then + skip("-O is not yet implemented in Tarantool") +elseif compiled_with_jit then cmd = lua .. " -O hello-411.lua" f = io.popen(cmd) equals(f:read'*l', 'Hello World', "-O") -- 2.39.2