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 8954E905AF2; Tue, 19 Dec 2023 19:30:00 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 8954E905AF2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1703003400; bh=TaES2jFi/j3xfNaYmcutqn+l4ZgFRIP9zF8jNs+1zrc=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=KVroYkXj2n3ibuT9jFIHkTvHCFq5D2Sd58IIaQPWJe1VpQqeHWvKg2FYwn0fPOuJi Sbha4ToLpUro/ZoIlOrdO7uNx5P2j6wv+R1+hFURg0xvqQgXDokxlwM7QNIIUBYtMm RVbIPzuOa7eYEgZgubd+/e0u3TRWqaJvw7w1eD6I= Received: from smtp56.i.mail.ru (smtp56.i.mail.ru [95.163.41.94]) (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 EA2C5905AC1 for ; Tue, 19 Dec 2023 19:29:59 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org EA2C5905AC1 Received: by smtp56.i.mail.ru with esmtpa (envelope-from ) id 1rFcyk-00CRGa-2g; Tue, 19 Dec 2023 19:29:59 +0300 To: Sergey Kaplun Date: Tue, 19 Dec 2023 16:27:06 +0000 Message-Id: <476e84bb2045ab5878ae66bb9aab9bd856ca274c.1703001072.git.imun@tarantool.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD9B1592A052B88CCADC723B38012FD4A199F6CA7F36E5B91021313CFAB8367EF908E2BE116634AD74D1C32A3843D2417F2B81F02621B55670DE3F2BCB55680D1E1784ED878CF4C7D9C X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7C2204D4F9A221771EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637CB87E27B59CE093D8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D80EDB62DFE8877AFCA5CB715920F70720117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCE4E369F5EA069656A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F4460429728776938767073520140C956E756FBB7A2CC0D3CB04F14752D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EEB28585415E75ADA986A01F665E7D37C5D8FC6C240DEA76429C9F4D5AE37F343AA9539A8B242431040A6AB1C7CE11FEE389DDFE3E282F3DD1040F9FF01DFDA4A8C4224003CC836476E2F48590F00D11D6E2021AF6380DFAD1A18204E546F3947C062BEEFFB5F8EA3E2E808ACE2090B5E1725E5C173C3A84C3C5EA940A35A165FF2DBA43225CD8A89F0A35B161A8BF67C1156CCFE7AF13BCA4B5C8C57E37DE458BEDA766A37F9254B7 X-C1DE0DAB: 0D63561A33F958A501C43C5537AEA036244276B7FF3B74E4EBCB193E1290E3C7F87CCE6106E1FC07E67D4AC08A07B9B062B3BD3CC35DA5889C5DF10A05D560A950611B66E3DA6D700B0A020F03D25A0997E3FB2386030E77 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF77DD89D51EBB7742D3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF87C4EAFABC0AC6F98DB468FAFEDDC7B5866A876534C250DCE23F9D08104F5AE2506ED036F265C542E190DC598EAEA94F3CCE71EDE095E9A6568D49EBE7164EF7E48CAC7CA610320002C26D483E81D6BEECAEF3E2CCC1ED8C383653B6C8D9AE0FD16FCAA6493B703A X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojbL9S8ysBdXjcyg4/A5x1hO2p9LAt3Q70 X-Mailru-Sender: 2FEBA92C8E508479FE7B9A1DF348D531877E7EF7C0A55A3C4974FB9C5DB6FC0EFD5457F5548CF5252326FE6F2A341ACE0FB9F97486540B4CD9E8847AB8CFED4D9ABF8A61C016C2CFB0DAF586E7D11B3E67EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit] test: adjust lua-Harness test error assertion 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" The current pattern in 303-package.t for the test case loading invalid Lua script is too tight for the following reasons revealed by Tarantool testing: * The platform might prepend the common prefix to all Lua errors, so anchoring the pattern to the beginning of the error message is too strict for matching the particular errors. * The platform might canonicalize module names (i.e., use absolute paths) for searchers and loaders, so matching the current working directory via "./" is too straight-forward. Hence, this patch removes the starting anchor from the pattern and fixes the last part of it to match only the "basename" of the module being loaded. As a result, the check is not too strict and Lua-specific but rather starts following common sense. Signed-off-by: Igor Munkin --- Branch: https://github.com/tarantool/luajit/tree/imun/fix-test-for-tarantool-searchers PR: https://github.com/tarantool/tarantool/pull/9511 Integration CI is red due to exercises with automatic submodule bumps. Testing in PR represents the integration part. test/lua-Harness-tests/303-package.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/lua-Harness-tests/303-package.t b/test/lua-Harness-tests/303-package.t index ccd7c510..b5b3d9ea 100755 --- a/test/lua-Harness-tests/303-package.t +++ b/test/lua-Harness-tests/303-package.t @@ -199,7 +199,7 @@ return complex f:write [[?syntax error?]] f:close() error_matches(function () require('syntax') end, - "^error loading module 'syntax' from file '%.[/\\]syntax%.lua':", + "error loading module 'syntax' from file '.+[/\\]syntax%.lua':", "function require (syntax error)") os.remove('syntax.lua') -- clean up -- 2.39.2