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 2AF006EC56; Mon, 15 Mar 2021 22:12:28 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 2AF006EC56 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1615835548; bh=xsAR8xMKwx9OjVvtngwmj1pPwM16bdFqQz2/GUoXTlE=; 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=xQE2EwR5+mEgTSncZi6SmqaJqRBSQkBFNPX7MbjOiBEHUvNjvCOs0NCoiENt2pbfN pQcWAszZJw//80jTyZeVhNmKGyP50M0Zi26FZam+LI4d5dcN3cvw75Zejes6vrZ69v x5SOzNLAzccOWgQsuUgp8WveRoT9RbFpyBSqWMCs= Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (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 165F96EC56 for ; Mon, 15 Mar 2021 22:12:25 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 165F96EC56 Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1lLsdb-0004aE-FM; Mon, 15 Mar 2021 22:12:24 +0300 Date: Mon, 15 Mar 2021 22:12:16 +0300 To: Sergey Kaplun Message-ID: <20210315191216.GH9042@tarantool.org> References: <31d2b8f880693c4af3d47d7c6693acfd79459052.1615819534.git.skaplun@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <31d2b8f880693c4af3d47d7c6693acfd79459052.1615819534.git.skaplun@tarantool.org> X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.10.1 (2018-07-13) X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9D3134714A9BDB69B54C6354AEEB3BDF9AAE3283F1E6CEA6100894C459B0CD1B94D8EFF3D38F8DBE364DC169E610FA28DEDD524DCF5CD7385FEFE3136639EADCB X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE73C871DD2182510D5EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006375C4806A08D329A618638F802B75D45FF914D58D5BE9E6BC131B5C99E7648C95C7FF294EE7CC9FD50F7F173DC2960AD1F4A46BB9869F34D6AA471835C12D1D9774AD6D5ED66289B5278DA827A17800CE71AE4D56B06699BBC9FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C3ED8438A78DFE0A9E117882F4460429728AD0CFFFB425014E868A13BD56FB6657A7F4EDE966BC389F9E8FC8737B5C22495B4C35AC65A386B3089D37D7C0E48F6CCF19DD082D7633A0E7DDDDC251EA7DABAAAE862A0553A39223F8577A6DFFEA7CB04B26703878C8DC43847C11F186F3C5E7DDDDC251EA7DABCC89B49CDF41148FA8EF81845B15A4842623479134186CDE6BA297DBC24807EABDAD6C7F3747799A X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2BBE337FB72E923155C0AF1600DCBC20BC34632CCC2A66CAB774ED383FCA43887 X-C1DE0DAB: 0D63561A33F958A5DA169840DBBB3D3E40848309F5A67CA4B314C7E07AA03124D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA75F04B387B5D7535DE410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34987A0E8D235BB534C692C46DE9A6453DC74447AADA45FEFED2EE9BF9E875E72514B274B5F5CEEACB1D7E09C32AA3244CFFB7FBAD91E82EA34345D9FF816F9B78853296C06374E602927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojmD8gqPF9k0ndbPUDi4WlEQ== X-Mailru-Sender: 689FA8AB762F73936BC43F508A0638220AC368C2857E8C096273C0A00DDA2CA1A7C8D0F45F857DBFE9F1EFEE2F478337FB559BB5D741EB964C8C2C849690F8E70A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v2 luajit 3/5] test: adjust lua-Harness test suite for Tarantool 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" Sergey, On 15.03.21, Sergey Kaplun wrote: > This patch makes it possible to run lua-Harness test suite using > Tarantool. > > 203-lexico.t and 301-basic.t is adjusted to valid working with > out-of-source build in Tarantool CI. > > Inside Tarantool's GitHub-CI there is no defined variable LOGNAME nor > USERNAME. This leads to test failure inside CI, because a string is > expected. So, now USERNAME is set manually via CMake. > > Part of tarantool/tarantool#5844 > Part of tarantool/tarantool#4473 > --- > test/lua-Harness-tests/203-lexico.t | 14 ++++++++++---- > test/lua-Harness-tests/301-basic.t | 6 +++++- > test/lua-Harness-tests/CMakeLists.txt | 4 ++++ > 3 files changed, 19 insertions(+), 5 deletions(-) > > diff --git a/test/lua-Harness-tests/203-lexico.t b/test/lua-Harness-tests/203-lexico.t > index c1abebf..5f79b3f 100755 > --- a/test/lua-Harness-tests/203-lexico.t > +++ b/test/lua-Harness-tests/203-lexico.t > @@ -117,20 +117,26 @@ do > like(msg, "^[^:]+:%d+: unfinished long comment .-near") > end > > +-- XXX: If this test is run out of the tests source tree, the > +-- relative paths below become invalid. Hence, we need to > +-- prepend the directory from the script (i.e. test) name to > +-- the auxiliary files to be loaded and executed. On the second thought, my fix is bad and inconvenient, considering you have missed a couple of other occurrences (just grep in lua-Harness-tests directory). Hence, I propose to introduce a new routine in tap.lua implementing kinda Perlish "goto &" to the Lua file in lua-Harness source tree to enclose this hack within the new function. > +local test_srcdir = arg[0]:gsub('([^/]+)%.t$', '') > + > if _VERSION >= 'Lua 5.2' or jit then > - dofile'lexico52/lexico.t' > + dofile(test_srcdir .. 'lexico52/lexico.t') > end > > if _VERSION >= 'Lua 5.3' or luajit21 then > - dofile'lexico53/lexico.t' > + dofile(test_srcdir .. 'lexico53/lexico.t') > end > > if _VERSION >= 'Lua 5.4' then > - dofile'lexico54/lexico.t' > + dofile(test_srcdir .. 'lexico54/lexico.t') > end > > if jit and pcall(require, 'ffi') then > - dofile'lexicojit/lexico.t' > + dofile(test_srcdir .. 'lexicojit/lexico.t') > end > > done_testing() > -- > 2.28.0 > -- Best regards, IM