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 AE7F76DA604; Wed, 15 Nov 2023 14:34:48 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org AE7F76DA604 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1700048088; bh=FrQGGQsnX4gNMsZhr6eanBliNyvfsKHb4uruKEbIq54=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=sn5HCmAc+OWNd4527xoi7Rkl0d6V9CIBPzHyReowkwAN0/tV05yTaEHKz0IhWEe1D HNOnLNNcpODRP3cHaTL42b9GO9B+hC/D4tLmPFGHko5EGYizSOnDrQz7j/uhcSNiZB J5w2ekDRFynqsNiYzrvZWq0aoo6K+jLZBLW81pNU= Received: from smtp42.i.mail.ru (smtp42.i.mail.ru [95.163.41.65]) (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 662AC6D9DC3 for ; Wed, 15 Nov 2023 14:34:47 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 662AC6D9DC3 Received: by smtp42.i.mail.ru with esmtpa (envelope-from ) id 1r3EAQ-003Rqs-1m; Wed, 15 Nov 2023 14:34:47 +0300 Message-ID: <05ef47a2-3248-4c04-86e5-3b2277768a67@tarantool.org> Date: Wed, 15 Nov 2023 14:34:46 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Sergey Kaplun , Sergey Bronnikov Cc: tarantool-patches@dev.tarantool.org, max.kokryashkin@gmail.com References: <6ea1998ab3bf37b75e3f399fc55572bb99392c0f.1699534835.git.sergeyb@tarantool.org> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9C2A6B03AB739174C420C4E2B999D9DE4AE6436C68FF9734400894C459B0CD1B90F79E606ED7412377D079B13A4642EEA0B8B7B89140680FD68841D2DEA990C46 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE78AC0750F3304E924EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637FC0948D7756001208638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D879361ADE99BBAEC01653903B90EE0B3E117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF80095D1E57F4578A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18BDFBBEFFF4125B51D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EE9647ADFADE5905B11DBC1C451FC279AAD8FC6C240DEA76429C9F4D5AE37F343AA9539A8B242431040A6AB1C7CE11FEE34CB6874B0BCFF0B8AD7EC71F1DB88427C4224003CC836476E2F48590F00D11D6E2021AF6380DFAD1A18204E546F3947CB861051D4BA689FC2E808ACE2090B5E1725E5C173C3A84C3C5EA940A35A165FF2DBA43225CD8A89F9FFED5BD9FB41755C6EABA9B74D0DA47B5C8C57E37DE458BEDA766A37F9254B7 X-C1DE0DAB: 0D63561A33F958A5164188D753857255BDBB80A2A80B11A6E69048E04F6EDF1BF87CCE6106E1FC07E67D4AC08A07B9B0AD74539164518AE5CB5012B2E24CD356 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CFF4DFCFDA936F783CA21585CE4F46DDE1B475C13C451FD1445DE22A6F39D17C205C1052AD1686EE738AC21204250FC4D05BEEE4A5BBA4170C874D13C2B54ED25DA74DFFEFA5DC0E7F02C26D483E81D6BE0DBAE6F56676BC7117BB6831D7356A2DEC5B5AD62611EEC62B5AFB4261A09AF0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojqFo78WLxrjG8+6nPzzeyvA== X-Mailru-Sender: 11C2EC085EDE56FAC07928AF2646A769E47013A369BADE289BC6F18B6C3D869287D154BA7A9C8918EBA65886582A37BD66FEC6BF5C9C28D98A98C1125256619760D574B6FC815AB872D6B4FCE48DF648AE208404248635DF 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 Bronnikov via Tarantool-patches Reply-To: Sergey Bronnikov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hello, Sergey please see my answers below Updates applied and force-pushed. On 11/13/23 10:10, Sergey Kaplun wrote: > 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/ Fixed. > >> 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/ Fixed. > >> following commit. >> >> The patch removes `TESTLIBS` and adds each test C library as dependence > Typo: s/dependence/a dependency/ Fixed. > >> to CMake target `tarantool-tests` explicitly using `add_dependence` > Typo: s/using/using the/ Fixed. > >> 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. Reverted the hunk: --- a/test/tarantool-tests/CMakeLists.txt +++ b/test/tarantool-tests/CMakeLists.txt @@ -132,6 +132,8 @@ 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 +# with dependecies are set in scope of BuildTestLib macro.  add_custom_command(TARGET tarantool-tests    COMMENT "Running Tarantool tests"    COMMAND >> -# 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 >>