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 850F8E3206A; Tue, 24 Sep 2024 13:32:12 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 850F8E3206A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1727173932; bh=qiwjkN55/Oc3wuoL0g+HGDccZdSgVJ7dZvSEk38XjSw=; 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=PjJwdfZS0KTiNIPdSrAn2VCkfIbA51C1SX6rMZf+HNbgSaL5/sORgcFpgOM9XoViR 3rNL3oL4SBHoIf42SUbs3EtUfGU9QUZnqcUzWpoERVgsKqyWRu8D1DOmt4L8WSyXQD 2usGNwn6pndS12mFaSjDFZhD/7QFf2E0MMRb8Vhw= Received: from smtp48.i.mail.ru (smtp48.i.mail.ru [95.163.41.86]) (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 6D0C8E32057 for ; Tue, 24 Sep 2024 13:30:14 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 6D0C8E32057 Received: by smtp48.i.mail.ru with esmtpa (envelope-from ) id 1st2o8-000000024Sz-3vXQ; Tue, 24 Sep 2024 13:30:13 +0300 To: Maxim Kokryashkin , Sergey Bronnikov Date: Tue, 24 Sep 2024 13:29:49 +0300 Message-ID: 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: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD968D81A599CAF0ABB433AEAA0FDFDAC9A3AA29B121F98EB2D182A05F5380850406560A1DC88933B17F378A8CA21F699D6EBABB0B247870C66136038D1A3840DCD88175C04187C9AB8 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE789066434B85BF7C7EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063743447F216C7C64BDEA1F7E6F0F101C6723150C8DA25C47586E58E00D9D99D84E1BDDB23E98D2D38B043BF0FB74779F36BB0B02C2551185EB13E52454AC9094399D6E849E34A720CBA471835C12D1D9774AD6D5ED66289B5278DA827A17800CE76E0B6B202B8EE8599FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C3FB12F4B11BB5604F117882F4460429728AD0CFFFB425014E868A13BD56FB6657E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F79006372A310894EFA5E9A9EFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-C1DE0DAB: 0D63561A33F958A5D36846CFDD86F4965002B1117B3ED696DA04970E70FA2959B74D9144D44E4FCF823CB91A9FED034534781492E4B8EEAD2739D626790C8313C79554A2A72441328621D336A7BC284946AD531847A6065A535571D14F44ED41 X-C8649E89: 1C3962B70DF3F0ADBF74143AD284FC7177DD89D51EBB7742424CF958EAFF5D571004E42C50DC4CA955A7F0CF078B5EC49A30900B95165D34C786159FDC4342B028FF76DEAC7C45C9F39C8A67DD14474F3C85CEF1F5F36CE36544C1DAC874FCB91D7E09C32AA3244CAF12A6804C6BBC0A86B83C6DB07BF3AEBCC90F3CC58E562CEA455F16B58544A21C197AAF4D2E4732A5AE236DF995FB59829709634694AABAED6A17656DB59BCAD427812AF56FC65B X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojamSMdo1tbG++YylT/jHVMQ== X-DA7885C5: 62B118D0369CC95FF255D290C0D534F9E566C3D8A5B550836B81FFABE1A41754C71985B724814E285B1A4C17EAA7BC4BEF2421ABFA55128DAF83EF9164C44C7E X-Mailru-Sender: 689FA8AB762F7393C6D0B12EA33CAA9BB4D1511FF5250F80598E7FB0904C86B341AA6FBB0485B212E49D44BB4BD9522A059A1ED8796F048DB274557F927329BE89D5A3BC2B10C37545BD1C3CC395C826B4A721A3011E896F X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 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 | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/test/tarantool-tests/CMakeLists.txt b/test/tarantool-tests/CMakeLists.txt index ff402dc0..5e3493b6 100644 --- a/test/tarantool-tests/CMakeLists.txt +++ b/test/tarantool-tests/CMakeLists.txt @@ -67,18 +67,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 ) @@ -163,4 +161,12 @@ foreach(test_path ${tests}) LABELS ${TEST_SUITE_NAME} DEPENDS tarantool-tests-deps ) + + # The part of the profilers toolchain is located in the + # directory, so LUA_PATH needs to be updated. + if(test_name MATCHES "^profilers") + AppendTestEnvVar(${test_title} + LUA_PATH "${PROJECT_SOURCE_DIR}/tools/?.lua\;" + ) + endif() endforeach() -- 2.46.0