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 693046EC55; Thu, 29 Jul 2021 12:49:01 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 693046EC55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1627552141; bh=NsG+RMv27MCrXVfyv4aJ6CEBVwI7ZHOxAu+NT7dVFkI=; 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=v9F5RvPNqosA+C2Ms4LVbug75HgwbiXHWhXaCin3U0IPW5gzCVEaBNCWoWzn/9ArW CbQQT1s+yYAFu7TuQEMUi6bqs5tvOVXqiGviKPq7wCgWpTob8t2hKM4VLuqj2bl6f/ XaRSjMlX2hMeXEpM6IKMNIZWQZGNhMYZGaBpY1eQ= Received: from smtp61.i.mail.ru (smtp61.i.mail.ru [217.69.128.41]) (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 E96C26EC55 for ; Thu, 29 Jul 2021 12:48:59 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org E96C26EC55 Received: by smtp61.i.mail.ru with esmtpa (envelope-from ) id 1m92ex-0001wn-1E; Thu, 29 Jul 2021 12:48:59 +0300 Date: Thu, 29 Jul 2021 12:47:46 +0300 To: =?utf-8?B?0JzQsNC60YHQuNC8INCa0L7RgNGP0LrRiNC40L0=?= Message-ID: References: <1627494133.365921222@f190.i.mail.ru> <1627550343.125610573@f728.i.mail.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1627550343.125610573@f728.i.mail.ru> X-4EC0790: 10 X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD941C43E597735A9C351B198F4576AC7B21928AAE70459C21B182A05F53808504052AD30BCFE2C6A7BDE1578A1E52CBF9493AEA27FB4DC6E6D56D661DEFC1AE145 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE70312E9A300D47E3BEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637E0FC02D497BF09508638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8D3432FFF3D4F02BE009DBFA822AA77B6117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF1175FABE1C0F9B6A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD182CC0D3CB04F14752D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B65D56369A3576CBA5089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A5D50888A17FA0B0D6CA534E20DCC0C715DAD5A59F19C4047BD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA751B940EDA0DFB0535410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D344A431191C56981FEDFF73D46D91550B95577B9322BAC01E0F66CE52D1DD118B5A8B18F650AB9DCA81D7E09C32AA3244C25DF7BA0982C9EFFAB06C4715F7FE7A7F522A1CF68F4BE05927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojPp/mPgZxawGOw27x79Tcpg== X-Mailru-Sender: 3B9A0136629DC91206CBC582EFEF4CB407993C6D9110FB3D47A89FE8730F764ACD8872D538E8F8CBF2400F607609286E924004A7DEC283833C7120B22964430C52B393F8C72A41A89437F6177E88F7363CDA0F3B3F5B9367 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v2 06/10] test: support tarantool in lua-Harness 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: Sergey Kaplun via Tarantool-patches Reply-To: Sergey Kaplun Cc: Maxim Kokryashkin , tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi, thanks for the fixes! LGTM! On 29.07.21, Максим Корякшин wrote: > > Hi! Thanks for the review, Sergey! > Here is the diff, which will add support of OOS build and will adjust > comment in CMakeLists: > ============================================================================================ > diff --git a/test/lua-Harness-tests/CMakeLists.txt b/test/lua-Harness-tests/CMakeLists.txt > index b9804033..90b4209a 100644 > --- a/test/lua-Harness-tests/CMakeLists.txt > +++ b/test/lua-Harness-tests/CMakeLists.txt > @@ -10,10 +10,10 @@ if(NOT PROVE) >    return() >  endif() > -# Tests create temporary files (see 303-package.t for example) > -# to require. Also, they require some files from original > -# test source directory. > -set(LUA_PATH "./?.lua\;${CMAKE_CURRENT_SOURCE_DIR}/?.lua\;${LUAJIT_SOURCE_DIR}/?.lua") > +# Tests create temporary files (see 303-package.t and 411-luajit.t for > +# example) to require. Also, they require some files from original test > +# source directory. > +set(LUA_PATH "./?.lua\;${CMAKE_CURRENT_SOURCE_DIR}/?.lua\;${LUAJIT_SOURCE_DIR}/?.lua\;${CMAKE_BINARY_DIR}/src/?.lua") >  set(LUA_TEST_FLAGS --failures --shuffle) >  if(CMAKE_VERBOSE_MAKEFILE) > ============================================================================================ >   >   > >  > >>Hi, Maxim! > >> > >>Thanks for the fixes! > >> > >>My bad, didn't check it before: > >> > >>When building out-of-source build and run tests, 411 test still failed, > >>because LUA_PATH doesn't include path to generated . > >> > >>Please add path to it in the . > >> > >>| module 'jit.vmdef' not found: > >>| no field package.preload['jit.vmdef'] > >>| no file './jit/vmdef.lua' > >>| no file '/home/burii/reviews/luajit/harness/test/lua-Harness-tests/jit/vmdef.lua' > >>| no file '/home/burii/reviews/luajit/harness/src/jit/vmdef.lua' > >>| no file './jit/vmdef.so' > >>| no file '/usr/local/lib/lua/5.1/jit/vmdef.so' > >>| no file '/usr/local/lib/lua/5.1/loadall.so' > >>| no file './jit.so' > >>| no file '/usr/local/lib/lua/5.1/jit.so' > >>| no file '/usr/local/lib/lua/5.1/loadall.so' > >> > >>On 28.07.21, Максим Корякшин wrote: > >>> > >>> Here is the new commit message: > >>> ================================================================================== > >> > >> > >> > >>> ================================================================================== > >>>   > >>> And the diff with LUA_PATH adjustments: > >>> ================================================================================== > >>> diff --git a/test/lua-Harness-tests/CMakeLists.txt b/test/lua-Harness-tests/CMakeLists.txt > >>> index b9804033..bd7f4a9c 100644 > >>> --- a/test/lua-Harness-tests/CMakeLists.txt > >>> +++ b/test/lua-Harness-tests/CMakeLists.txt > >>> @@ -13,7 +13,7 @@ endif() > >>>  # Tests create temporary files (see 303-package.t for example) > >>>  # to require. Also, they require some files from original > >>>  # test source directory. > >> > >>Nit: Also you may adjust those comment about required files. > >> > >>> -set(LUA_PATH "./?.lua\;${CMAKE_CURRENT_SOURCE_DIR}/?.lua\;") > >>> +set(LUA_PATH "./?.lua\;${CMAKE_CURRENT_SOURCE_DIR}/?.lua\;${LUAJIT_SOURCE_DIR}/?.lua") > >>>  set(LUA_TEST_FLAGS --failures --shuffle) > >>>   > >>>  if(CMAKE_VERBOSE_MAKEFILE) > >>> =================================================================================== > >>>   > >>>   > >>> -- > >>> Максим Корякшин > >>>   > >>>   > >>> >Вторник, 27 июля 2021, 13:05 +03:00 от Sergey Kaplun < skaplun@tarantool.org >: > >>> >  > >>> >Hi, Maxim! > >>> > > >>> >Thanks for the patch! > >>> > > >>> >Please consider my comments below. > >>> > > >>> >On 20.07.21, Maxim Kokryashkin wrote: > >>> >> Backports 'supoort Tarantool' patch[1] from lua-Harness. > >>> >> > >>> >> [1]: https://framagit.org/fperrad/lua-Harness/-/commit/d3ceee16 > >>> >> > >>> >> Part of tarantool/tarantool#5970 > >>> >> Part of tarantool/tarantool#4473 > >>> >> --- > >>> > > >>> >| test: support tarantool in lua-Harness > >>> > > >>> >Nit: s/tarantool/Tarantool/. > >>> > > >>> >| > >>> >| Backports 'support Tarantool' patch[1] from lua-Harness. > >>> > > >>> >Nit: s/Tarantool/tarantool/ regarding to the original commit message. > >>> > > >>> >| This patch introduces lua-Harness profile for Tarantool considering the > >>> >| platform specifics. Furthermore, these changes skip all CLI-related > >>> >| tests for Tarantool binary, so 241-standalone.t and 411-luajit.t can be > >>> >| renamed back. > >>> > > >>> >I afraid, not so fast. Within these changes tests are failed in the > >>> >LuaJIT's repo with the following error: > >>> >|! unknown luaJIT command or jit.* modules not installed > >>> > > >>> >Seems like LUA_PATH should be adjusted for these tests. > >>> >| > >>> >| [1]: https://framagit.org/fperrad/lua-Harness/-/commit/d3ceee16 > >>> >| > >>> >| Part of tarantool/tarantool#5970 > >>> >| Part of tarantool/tarantool#4473 > >>> > > >>> >> ...standalone.t.disabled => 241-standalone.t} | 5 ++ > >>> >> test/lua-Harness-tests/320-stdin.t | 2 +- > >>> >> .../{411-luajit.t.disabled => 411-luajit.t} | 2 +- > >>> >> test/lua-Harness-tests/profile_tarantool.lua | 63 +++++++++++++++++++ > >>> >> 4 files changed, 70 insertions(+), 2 deletions(-) > >>> >> rename test/lua-Harness-tests/{241-standalone.t.disabled => 241-standalone.t} (99%) > >>> >> rename test/lua-Harness-tests/{411-luajit.t.disabled => 411-luajit.t} (99%) > >>> >> create mode 100644 test/lua-Harness-tests/profile_tarantool.lua > >>> > > >>> > > >>> > > >>> >-- > >>> >Best regards, > >>> >Sergey Kaplun > >>>   > >> > >>-- > >>Best regards, > >>Sergey Kaplun > >  -- Best regards, Sergey Kaplun