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 C82DE6B63EC; Mon, 13 Nov 2023 10:14:41 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C82DE6B63EC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1699859681; bh=97RMJ3hPR/2Nb7+6amzTJxjfPBcTmP5E8a/AXwzgAn0=; 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=jl6cPd5Q6CYXQl45HlRH155jzBCSaLrPY7b5dqf7hFqykryBkOxi+QXywJB17eK3a vSL/GRRAskYgb/BpJ6Y7A5nUuYRtNv/KfVE/Xq+GkiNaNrKpIamfbZZ+AYVXZmJXmf idV9vd/zm46JHI8lFXGYqfsWqjNqN/vif69xmoZQ= 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 1D9C46B63EC for ; Mon, 13 Nov 2023 10:14:40 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 1D9C46B63EC Received: by smtp56.i.mail.ru with esmtpa (envelope-from ) id 1r2R9a-00GSTY-0j; Mon, 13 Nov 2023 10:14:38 +0300 Date: Mon, 13 Nov 2023 10:10:04 +0300 To: Sergey Bronnikov Message-ID: References: <6ea1998ab3bf37b75e3f399fc55572bb99392c0f.1699534835.git.sergeyb@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <6ea1998ab3bf37b75e3f399fc55572bb99392c0f.1699534835.git.sergeyb@tarantool.org> X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9C2A6B03AB739174C4AB4325CA29B01B0ABB192FC909DF40600894C459B0CD1B9345FB9332CDDFE8D9DE48724522A95829B654C1701C1F8508E47C47A18F2969E X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE70C5E0F71D77D667BEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006375045C080FAAE96148638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D86E2392BF8B5CBA9CCA356B7920D545A0117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCECADA55FE5B58BB7A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18E5D25F19253116ADD2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EE0AC5B80A05675ACD500AC0B2F9B62304D8FC6C240DEA76429C9F4D5AE37F343AA9539A8B242431040A6AB1C7CE11FEE3093C2F12201C912A9735652A29929C6CC4224003CC836476E2F48590F00D11D6E2021AF6380DFAD1A18204E546F3947CD2DCF9CF1F528DBC2E808ACE2090B5E1725E5C173C3A84C317B107DEF921CE79089D37D7C0E48F6C8AA50765F79006372EF97DFF34A471AFEFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-C1DE0DAB: 0D63561A33F958A5C74F33BBDAE6AFBE0963A0AD47D7B7ED44F832A2B2FFB660F87CCE6106E1FC07E67D4AC08A07B9B0AD74539164518AE5CB5012B2E24CD356 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CFFD62C6FCBC2DA6CD1EDADECBB8C718BD6CC1B194CC040BC1DE10C4F63D0E99F0BC84317DE625615372E3BA2733712135D4301BA6BB55209ECC633390AAAD7441A74DFFEFA5DC0E7F02C26D483E81D6BE5EF9655DD6DEA7D65774BB76CC95456EEC5B5AD62611EEC62B5AFB4261A09AF0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojg8Y/IM6oQGKSoGRtZuLUuA== X-Mailru-Sender: 11C2EC085EDE56FAC07928AF2646A769091D5F4EAB4DC19AD0FEEFA69E69D3B67AD558DE3329E344DEDBA653FF35249392D99EB8CC7091A70E183A470755BFD208F19895AA18418972D6B4FCE48DF648AE208404248635DF X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 2/3][v2] test: set dependencies to tarantool-tests explicitly 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: max.kokryashkin@gmail.com, tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi, Sergey! Thanks for the patch! LGTM, after fixing my comments below. On 09.11.23, Sergey Bronnikov wrote: > From: Sergey Bronnikov > > In testsuite `tarantool-tests` we are using CMake macro `BuildTestCLib` Typo: s/`tarantool-tests`/`tarantool-tests`,/ Typo: s/CMake/the CMake/ > for building test C libraries. This macro builds a list `TESTLIBS` that > contains all libraries required for tarantool tests. However, CMake > skips adding C library to `TESTLIBS` on building test C library in the Typo: s/adding C library/adding the C library/ Nit: s/on/when/ Typo: s/building test C library/building the test C library/ > following commit. > > The patch removes `TESTLIBS` and adds each test C library as dependence Typo: s/dependence/a dependency/ > to CMake target `tarantool-tests` explicitly using `add_dependence` Typo: s/using/using the/ > command. > --- > test/tarantool-tests/CMakeLists.txt | 17 +++++------------ > 1 file changed, 5 insertions(+), 12 deletions(-) > > diff --git a/test/tarantool-tests/CMakeLists.txt b/test/tarantool-tests/CMakeLists.txt > index c15d6037..d46e69a0 100644 > --- a/test/tarantool-tests/CMakeLists.txt > +++ b/test/tarantool-tests/CMakeLists.txt > @@ -10,6 +10,10 @@ if(NOT PROVE) > return() > endif() > > +add_custom_target(tarantool-tests > + DEPENDS ${LUAJIT_TEST_BINARY} > +) > + > macro(BuildTestCLib lib sources) > add_library(${lib} SHARED EXCLUDE_FROM_ALL ${sources}) > target_include_directories(${lib} PRIVATE > @@ -37,12 +41,7 @@ macro(BuildTestCLib lib sources) > CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}" > ) > endif() > - # XXX: Append the lib to be built to the dependency list. > - # Unfortunately, there is no convenient way in CMake to extend > - # the list in parent scope other than join two strings with > - # semicolon. If one finds the normal way to make it work, feel > - # free to reach me. > - set(TESTLIBS "${lib};${TESTLIBS}" PARENT_SCOPE) > + add_dependencies(tarantool-tests ${lib}) > # Add the directory where the lib is built to the list with > # entries for LUA_CPATH environment variable, so LuaJIT can find > # and load it. See the comment about extending the list in the > @@ -133,11 +132,6 @@ else() > list(APPEND LUA_TEST_ENV_MORE LD_LIBRARY_PATH=${LD_LIBRARY_PATH}) > endif() > > -# LUA_CPATH and LD_LIBRARY_PATH variables and also TESTLIBS list I suppose that information about LUA_PATH and LD_LIBRARY_PATH may stay. > -# with dependecies are set in scope of BuildTestLib macro. > -add_custom_target(tarantool-tests > - DEPENDS ${LUAJIT_TEST_BINARY} ${TESTLIBS} > -) > add_custom_command(TARGET tarantool-tests > COMMENT "Running Tarantool tests" > COMMAND > @@ -154,4 +148,3 @@ add_custom_command(TARGET tarantool-tests > ${LUA_TEST_FLAGS} > WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} > ) > - > -- > 2.34.1 > -- Best regards, Sergey Kaplun