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 5BB956EC56; Tue, 16 Mar 2021 15:03:25 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 5BB956EC56 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1615896205; bh=7a0gVPEqQTZ2udymzKe68QvvLIvdkEKWQivTEaWpOyk=; 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=ek/2Q81lLfyjN3IKYEGmWQPVEMOXWXG6Fs8+eQ1XS4s0nWZXThT5/bBV65rDxsFFq xQ9+DNhkmymIkCF+oEvlvJRftgBT7wPAVAvj4A+DO0ZaOruduBUdjrozltmWhkirLD J8gpmr/gNUUtxBFfbmzUEJKgM1EruswKGB+TjPm8= Received: from smtp48.i.mail.ru (smtp48.i.mail.ru [94.100.177.108]) (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 6DB466EC56 for ; Tue, 16 Mar 2021 15:03:24 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 6DB466EC56 Received: by smtp48.i.mail.ru with esmtpa (envelope-from ) id 1lM8Pz-0003DM-Ij; Tue, 16 Mar 2021 15:03:23 +0300 Date: Tue, 16 Mar 2021 15:02:33 +0300 To: Igor Munkin Message-ID: <20210316120233.GB1155@root> References: <20210315173730.GE9042@tarantool.org> <20210315181028.GB16737@root> <20210315210619.GI9042@tarantool.org> <20210316093821.GA1155@root> <20210316110837.GL9042@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210316110837.GL9042@tarantool.org> X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9D3134714A9BDB69BBBF766E27323369B0CCE27335774643500894C459B0CD1B9E239555862DCDC0B2813CB863C6A8B747BECAAE27F03F58FB6BD4AB1FA1FD0A3 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE755BE8F535441E38CEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637F1FEB73A813C0D3B8638F802B75D45FF914D58D5BE9E6BC131B5C99E7648C95CF89CA98302ED496F8E6E212C784CEC98581DE8E903134B53A471835C12D1D9774AD6D5ED66289B5278DA827A17800CE77A825AB47F0FC8649FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C34964A708C60C975A117882F4460429728AD0CFFFB425014E868A13BD56FB6657A7F4EDE966BC389F9E8FC8737B5C22490E26A56DB46E81E4089D37D7C0E48F6CCF19DD082D7633A0E7DDDDC251EA7DABAAAE862A0553A39223F8577A6DFFEA7CCD798FA1FEA6F93543847C11F186F3C5E7DDDDC251EA7DABCC89B49CDF41148FA8EF81845B15A4842623479134186CDE6BA297DBC24807EABDAD6C7F3747799A X-C1DE0DAB: 0D63561A33F958A52DC335EA642536A7E4F0D1F5747BD03F17ADCE887E1F2B18D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA75F04B387B5D7535DE410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3435B1F14A93C4073FC735354DB6B4C0BA24C611D98C6566448193F948594E77A2C866C08E080E16F61D7E09C32AA3244CC705495967B799FEE83A24201EAAB0B81E098CBE561D6343FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojmD8gqPF9k0kcH1ynnZmJhA== X-Mailru-Sender: 3B9A0136629DC91206CBC582EFEF4CB477C592074404B65E0A143923F6CD64BA0EE1C7D6AC3B6305F2400F607609286E924004A7DEC283833C7120B22964430C52B393F8C72A41A89437F6177E88F7363CDA0F3B3F5B9367 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v2 luajit 1/5] test: add lua-Harness test suite 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: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Igor, Thanks for the feedback! On 16.03.21, Igor Munkin wrote: > Sergey, > > Thanks for the fixes! > > On 16.03.21, Sergey Kaplun wrote: > > Igor, > > > > On 16.03.21, Igor Munkin wrote: > > > Sergey, > > > > > > > > > > > > > > > diff --git a/test/lua-Harness-tests/CMakeLists.txt b/test/lua-Harness-tests/CMakeLists.txt > > > > > > new file mode 100644 > > > > > > index 0000000..9b35e5a > > > > > > --- /dev/null > > > > > > +++ b/test/lua-Harness-tests/CMakeLists.txt > > > > > > @@ -0,0 +1,49 @@ > > > > > > +# Test suite that has been added from lua-Harness test suite > > > > > > +# in scope of https://github.com/tarantool/tarantool/issues/4473. > > > > > > + > > > > > > +# See the rationale in the root CMakeLists.txt > > > > > > +cmake_minimum_required(VERSION 3.1 FATAL_ERROR) > > > > > > + > > > > > > +find_program(PROVE prove) > > > > > > +if(NOT PROVE) > > > > > > + message(WARNING "`prove' is not found, so lua-Harness-tests target is not generated") > > > > > > + return() > > > > > > +endif() > > > > > > + > > > > > > +set(LUA_TEST_FLAGS --failures --shuffle) > > > > > > > > > > Why did you drop TEST_DEPS variable containing the dependencies? > > > > > > > > Sorry, don't get it. What do you mean? > > > > > > If you look onto my iterative patch in the first review iteration, > > > you'll find TEST_DEPS variable similar to the one in tarantool-tests > > > CMakeLists.txt. I forgot to add it into CMakeLists.txt for LuaJIT-tests > > > and remembered about it in this patch. > > > > Sorry, I missed it while looks through your patch -- I supposed that > > it does two things: > > * removes tap renaming > > * removes list of test usage, as far as 5040 is resolved > > Yeah, that's my fault. > > > > > For now I don't understand, why do we need this TEST_DEPS? > > What is its mission? > > To control the target dependencies: the binary and test chunks. However, > it was required when *-tests targets were not .PHONY, and now it's more > for self-check that nothing global is broken. OK, looks like we came to agreement offline so I just repeate this here: * All test chunks are `.PHONY`, so all tests will rerun always, even without test sources changing. That's why we need only build dependencies here. * We are planing to make all test suites more consistent, so TEST_DEPS will be removed from Tarantool's suite too later. > > > > > > > > > > > > > > > > > > > > > +if(CMAKE_VERBOSE_MAKEFILE) > > > > > > + list(APPEND LUA_TEST_FLAGS --verbose) > > > > > > +endif() > > > > > > + > > > > > > +string(CONCAT LUA_PATH > > > > > > + "./?.lua\;" > > > > > > + "${CMAKE_CURRENT_SOURCE_DIR}/?.lua\;" > > > > > > + "${LUAJIT_SOURCE_DIR}/?.lua\;" > > > > > > +) > > > > > > > > > > There is not a word regarding such complex LUA_PATH configuration. > > > > > > > > Ok, it can be the one long string, but, in my opinion, this format is > > > > more readable, plus, as a bonus, with it line length is less than 120 > > > > characters. I'll join these lines into one if you insist. > > > > > > This is not the issue (and might be much better that my approach in > > > tarantool-tests and I will patch the test runners to make it conform to > > > one style later). I'm talking about the purpose for each entry. E.g. why > > > do you need both "./?.lua" and "${CMAKE_CURRENT_SOURCE_DIR}/?.lua"? If > > > you need "${LUAJIT_SOURCE_DIR}/?.lua" for jit.* modules, then why it's > > > not required for other suites? Mention this explicitly, please. > > > > Got it now, thanks! > > Looks like it really is not necessary. See the iterative patch below: > > Checked result in CI -- it is green, except known freebsd issue. > > > > =================================================================== > > diff --git a/test/lua-Harness-tests/CMakeLists.txt b/test/lua-Harness-tests/CMakeLists.txt > > index b844788..fd5c8ce 100644 > > --- a/test/lua-Harness-tests/CMakeLists.txt > > +++ b/test/lua-Harness-tests/CMakeLists.txt > > @@ -15,16 +15,7 @@ if(CMAKE_VERBOSE_MAKEFILE) > > list(APPEND LUA_TEST_FLAGS --verbose) > > endif() > > > > -string(CONCAT LUA_PATH > > - "./?.lua\;" > > - "${CMAKE_CURRENT_SOURCE_DIR}/?.lua\;" > > - "${LUAJIT_SOURCE_DIR}/?.lua\;" > > -) > > - > > -string(CONCAT LUA_CPATH > > - "./?${CMAKE_SHARED_LIBRARY_SUFFIX}\;" > > - "${LUAJIT_SOURCE_DIR}/?${CMAKE_SHARED_LIBRARY_SUFFIX}\;" > > -) > > +set(LUA_PATH "./?.lua\;${CMAKE_CURRENT_SOURCE_DIR}/?.lua\;") > > Still not a word, why do you need both "./?.lua" and > "${CMAKE_CURRENT_SOURCE_DIR}/?.lua". Sorry, add corresponding comment: =================================================================== diff --git a/test/lua-Harness-tests/CMakeLists.txt b/test/lua-Harness-tests/CMakeLists.txt index a639553..336dc03 100644 --- a/test/lua-Harness-tests/CMakeLists.txt +++ b/test/lua-Harness-tests/CMakeLists.txt @@ -15,6 +15,9 @@ if(CMAKE_VERBOSE_MAKEFILE) list(APPEND LUA_TEST_FLAGS --verbose) 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\;") add_custom_target(lua-Harness-tests DEPENDS ${LUAJIT_TEST_BINARY}) =================================================================== > > > > > add_custom_target(lua-Harness-tests DEPENDS ${LUAJIT_TEST_BINARY}) > > > > @@ -33,7 +24,6 @@ add_custom_command(TARGET lua-Harness-tests > > COMMAND > > env > > LUA_PATH="${LUA_PATH}\;" > > - LUA_CPATH="${LUA_CPATH}\;" > > # XXX: 309-os.t checks os.getenv() function by examining of > > # USERNAME or LOGNAME environment variable. > > # These variables might not be set in the environment, so > > =================================================================== > > > > > > > > > -- > > Best regards, > > Sergey Kaplun > > -- > Best regards, > IM -- Best regards, Sergey Kaplun