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 A61A3C9DF81; Mon, 23 Sep 2024 10:21:17 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org A61A3C9DF81 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1727076077; bh=ILTakta+W/G45ciCIK65MCZDWRRB1CZNEIuvsRx3uU0=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=D2wI2R8MsgQVidt6ZUUgKJELJH1g9b4cok4cKoGDEffb0DcZeokemO47L0rGg4t9f D6tfRSA8T+jAMvbcUH2Rdp78BbOS/Tep9cvH8Yg/TthPCFpIgzVpa9kk02lRV/hGyP XBCUM+cH5LgvE2j7dujkAJa4fjliwGE+Z7T5grwc= Received: from smtp31.i.mail.ru (smtp31.i.mail.ru [95.163.41.72]) (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 EB91BCC8EAE for ; Mon, 23 Sep 2024 10:19:18 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org EB91BCC8EAE Received: by smtp31.i.mail.ru with esmtpa (envelope-from ) id 1ssdLo-0000000C9Sx-3d8v; Mon, 23 Sep 2024 10:19:17 +0300 To: Maxim Kokryashkin , Sergey Bronnikov Date: Mon, 23 Sep 2024 10:18:50 +0300 Message-ID: <2a773d9a5c814c298f1e1ae1f359060cbbc560f4.1727074292.git.skaplun@tarantool.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD96E52E9D942F25A5FE281CFE3054BEC19602F0584FABBB98600894C459B0CD1B9339A50E0077B5B8DC23CA552186D3265851D58D346A0364D693F64E413CBBBEE854E8B091AFA3944 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE78E8764B5BC580342EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637CD1DFD3ABA64F6568638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8B9B86B465646EB62A57B93FDDFD97B754B561C4521E52923CC7F00164DA146DAFE8445B8C89999728AA50765F7900637F1F33655BFBB40449FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C3D6B8D1F75A55B56DCC7F00164DA146DA6F5DAA56C3B73B237318B6A418E8EAB8D32BA5DBAC0009BE9E8FC8737B5C2249140B36D152ABFE7676E601842F6C81A12EF20D2F80756B5FB606B96278B59C4276E601842F6C81A127C277FBC8AE2E8B3A7E52208E84F7563AA81AA40904B5D99C9F4D5AE37F343AD1F44FA8B9022EA23BBE47FD9DD3FB595F5C1EE8F4F765FCF1175FABE1C0F9B6E2021AF6380DFAD18AA50765F7900637F09814068C508CC822CA9DD8327EE4930A3850AC1BE2E73589424AA0EF8DE9BAC4224003CC83647689D4C264860C145E X-C1DE0DAB: 0D63561A33F958A54C011962FE48532B5002B1117B3ED696551DFCCC5FC3DB97CA7E60A991436CA2823CB91A9FED034534781492E4B8EEADEF0AF71940E62277C79554A2A72441328621D336A7BC284946AD531847A6065A535571D14F44ED41 X-C8649E89: 1C3962B70DF3F0ADBF74143AD284FC7177DD89D51EBB7742424CF958EAFF5D571004E42C50DC4CA955A7F0CF078B5EC49A30900B95165D34F05B761BB9C2AA44C8E205220F12EBDE570BD047C8CBB9D512CEDB32A5A5F46919B3C44F20D05E0F1D7E09C32AA3244C14E2E746FA2F5E824EB7DF677E51682DDD86FBA39B87F9F3EA455F16B58544A21C197AAF4D2E4732A5AE236DF995FB59829709634694AABAED6A17656DB59BCAD427812AF56FC65B X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojcsBYxvRMKeylCXq9XFlRQA== X-Mailru-Sender: 520A125C2F17F0B1A9638AD358559B596C8DB5C728A8F9C00578E6996F3834133A9507D81FA90AE9B7CBEF92542CD7C88B0A2698F12F5C9EC77752E0C033A69E86920BD37369036789A8C6A0E60D2BB63A5DB60FBEB33A8A0DA7A0AF5A3A8387 X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit 4/7] test: shrink LUA_PATH environment variable 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" This patch removes the default adding of the tools directory to the LUA_PATH. Now it is done only for profilers tests. Part of tarantool/tarantool#9898 --- test/tarantool-tests/CMakeLists.txt | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/test/tarantool-tests/CMakeLists.txt b/test/tarantool-tests/CMakeLists.txt index 4530c9fd..a1339100 100644 --- a/test/tarantool-tests/CMakeLists.txt +++ b/test/tarantool-tests/CMakeLists.txt @@ -62,18 +62,16 @@ add_subdirectory(profilers/gh-5813-resolving-of-c-symbols/gnuhash) add_subdirectory(profilers/gh-5813-resolving-of-c-symbols/hash) add_subdirectory(profilers/gh-5813-resolving-of-c-symbols/stripped) -# The part of the memory profiler toolchain is located in tools -# directory, jit, profiler, and bytecode toolchains are located -# in src/ directory, jit/vmdef.lua is autogenerated file also -# located in src/ directory, but in the scope of the binary -# artefacts tree and auxiliary tests-related modules are located +# JIT, profiler, and bytecode toolchains are located in the +# directory, is the autogenerated file also +# located in the directory, but in the scope of the binary +# artifacts tree, and auxiliary tests-related modules are located # in the current directory (but tests are run in the binary -# directory), so LUA_PATH need to be updated. +# directory), so LUA_PATH needs to be updated. make_lua_path(LUA_PATH PATHS ${CMAKE_CURRENT_SOURCE_DIR}/?.lua ${CMAKE_CURRENT_SOURCE_DIR}/?/init.lua - ${PROJECT_SOURCE_DIR}/tools/?.lua ${LUAJIT_SOURCE_DIR}/?.lua ${LUAJIT_BINARY_DIR}/?.lua ) @@ -159,3 +157,15 @@ foreach(test_path ${tests}) DEPENDS tarantool-tests-deps ) endforeach() + +# The part of the profilers toolchain is located in the +# directory, so LUA_PATH needs to be updated. +file(GLOB_RECURSE profilers_tests + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + "profilers/*${LUA_TEST_SUFFIX}" +) +foreach(test_name ${profilers_tests}) + AppendTestEnvVar("test/${TEST_SUITE_NAME}/${test_name}" + LUA_PATH "${PROJECT_SOURCE_DIR}/tools/?.lua\;" + ) +endforeach() -- 2.46.0