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 564EDEA823B; Tue, 24 Sep 2024 14:15:05 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 564EDEA823B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1727176505; bh=2Dy235BKYYKA7bZHUQOxQz69v8IO0q5AaVP0xyCHY8o=; 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=j30T/0rsz5wFRbnJ23EXtuZ1onS4czXTjC2Rr/O0b6DFcALkVdrtDBJGWXUis86RT vCoz3/f1jJhBuN0jHarkN+viHWMrqIJhMxWFsnkJ/wKXdCefsEUk5S+TmN2QHwcPDh HQ1PzxjIofWlmHKYZk3zhCYAgfa2pYaQ1Bwj1KGI= Received: from smtp47.i.mail.ru (smtp47.i.mail.ru [95.163.41.85]) (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 DA9B1EA823B for ; Tue, 24 Sep 2024 14:15:04 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org DA9B1EA823B Received: by smtp47.i.mail.ru with esmtpa (envelope-from ) id 1st3VW-00000003W9H-0sh9; Tue, 24 Sep 2024 14:15:02 +0300 Content-Type: multipart/alternative; boundary="------------7BC1mJE0PCdj0RvReDB8i1Co" Message-ID: Date: Tue, 24 Sep 2024 14:15:01 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Sergey Kaplun , Maxim Kokryashkin Cc: tarantool-patches@dev.tarantool.org References: In-Reply-To: X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD968D81A599CAF0ABBC1345680966DF287F24EB08D8B60A410182A05F538085040F84E52D827A37586A6D5EE0DB6E1EC8D207C679943254CF4BA1C620C1488912C955D7F540D105623 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7544B1CCE26E01C74EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006372B866E63D69A26578638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8B3284693EEAC9FC19411D2A5FC16AF9D4C76D2A07AABB7B9CC7F00164DA146DAFE8445B8C89999728AA50765F790063783E00425F71A4181389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC886A7C529F68B8E5CF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947C632EDEA9CD5989A36136E347CC761E074AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C3CF39425AD3EEC986BA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CF3D321E7403792E342EB15956EA79C166A417C69337E82CC275ECD9A6C639B01B78DA827A17800CE702706FBA10211704731C566533BA786AA5CC5B56E945C8DA X-C1DE0DAB: 0D63561A33F958A58C4A46E4D3B2696D5002B1117B3ED6961019602341E3FB98559C6C5561145D6F823CB91A9FED034534781492E4B8EEAD09F854029C6BD0DABDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADBF74143AD284FC7177DD89D51EBB7742424CF958EAFF5D571004E42C50DC4CA955A7F0CF078B5EC49A30900B95165D34A5970F8A4685C8ABDAABCF794216E170073336A454AD82A7D70293E147C7073BADD7BEB3EEC3D7751D7E09C32AA3244C19DC4E42467CC227921CC9A31F9C4781465D109DA36AF51FEA455F16B58544A2557BDE0DD54B3590A5AE236DF995FB59978A700BF655EAEEED6A17656DB59BCAD427812AF56FC65B X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojamSMdo1tbG98VSfIvXijmg== X-Mailru-Sender: 520A125C2F17F0B1E52FEF5D219D61405F8F763E524470E13C7CD3D963A542815CF68F275FD24EC30152A3D17938EB451EB5A0BCEC6A560B3DDE9B364B0DF289BE2DA36745F2EEB5CEBA01FB949A1F1EEAB4BC95F72C04283CDA0F3B3F5B9367 X-Mras: Ok Subject: Re: [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 Bronnikov via Tarantool-patches Reply-To: Sergey Bronnikov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" This is a multi-part message in MIME format. --------------7BC1mJE0PCdj0RvReDB8i1Co Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi, Sergey, On 24.09.2024 13:29, Sergey Kaplun wrote: > 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() AFAIR, we decided to move the last hunk to profilers/CMakeLists.txt. --------------7BC1mJE0PCdj0RvReDB8i1Co Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit

Hi, Sergey,


On 24.09.2024 13:29, Sergey Kaplun wrote:
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 <src/>
+# directory, <jit/vmdef.lua> is the autogenerated file also
+# located in the <src/> 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 <tools/>
+  # 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()

AFAIR, we decided to move the last hunk to profilers/CMakeLists.txt.


--------------7BC1mJE0PCdj0RvReDB8i1Co--