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 519985284B1; Mon, 23 Sep 2024 11:47:10 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 519985284B1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1727081230; bh=vvbdQaZdIjYXsJjhjoEjF+ALP5STbACFkz2QXe+SeiA=; 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=sg7SUbkKvW4T1hOmBXDJht1CohckgyopOalT//HE9fDxSEBxq2yIU+eyKakGBEsYT yPXXn5llyaIS2sXo7jfXTPjt3wINV1WTJCxT1fg0fMqzXcE8OLFWkoJ975ElB3JsPx 8FpPpe/Rk2Fo7yyH+HyOqDwcgmxk+0Ov2IUh1K0A= Received: from smtp40.i.mail.ru (smtp40.i.mail.ru [95.163.41.81]) (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 8155C5284B1 for ; Mon, 23 Sep 2024 11:47:08 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 8155C5284B1 Received: by smtp40.i.mail.ru with esmtpa (envelope-from ) id 1sseip-000000063Rl-0r80; Mon, 23 Sep 2024 11:47:07 +0300 Content-Type: multipart/alternative; boundary="------------5bdE1hC4EUZOqwjlCZTis07S" Message-ID: Date: Mon, 23 Sep 2024 11:47:06 +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: <2a773d9a5c814c298f1e1ae1f359060cbbc560f4.1727074292.git.skaplun@tarantool.org> In-Reply-To: <2a773d9a5c814c298f1e1ae1f359060cbbc560f4.1727074292.git.skaplun@tarantool.org> X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD96E52E9D942F25A5FE7CF5AB653483A7D6C2A69D46403807C00894C459B0CD1B957C52875CB0657F1514C2DC642588D9A9490B015FC2BAEDC2BB697E5DCC153E1DAEE934B56E2D9F8 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7544B1CCE26E01C74EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063745B6F93C788775E78638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D829535F7CD8D4CDD20BFC61F0CFCA2370307A56CEAB495174CC7F00164DA146DAFE8445B8C89999728AA50765F790063783E00425F71A4181389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC86089696B24BB1D19F6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947C4D3DDB508812D9002D242C3BD2E3F4C64AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C3276AF1BC4D358A0CBA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CF3D321E7403792E342EB15956EA79C166A417C69337E82CC275ECD9A6C639B01B78DA827A17800CE702706FBA10211704731C566533BA786AA5CC5B56E945C8DA X-C1DE0DAB: 0D63561A33F958A5967D5D24081AB1225002B1117B3ED696C9B89E53ABFF22C04869453249F34FA4823CB91A9FED034534781492E4B8EEAD9CFA8CFAC159CE19BDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADBF74143AD284FC7177DD89D51EBB7742424CF958EAFF5D571004E42C50DC4CA955A7F0CF078B5EC49A30900B95165D342C0B628602DFD0BCBB6F9C9EE246119D7C2D069EBDB98BE23BE9F44E72A34B78835334AA2F0A74181D7E09C32AA3244C067B4536214983D8A0CBE312C330D7D5CAB8A9E20FCA2374EA455F16B58544A2557BDE0DD54B3590A5AE236DF995FB59978A700BF655EAEEED6A17656DB59BCAD427812AF56FC65B X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojcsBYxvRMKeyevp+PYwmCxA== X-Mailru-Sender: 520A125C2F17F0B1E52FEF5D219D614057C52875CB0657F1514C2DC642588D9AC4BBFBCA995415080152A3D17938EB451EB5A0BCEC6A560B3DDE9B364B0DF289BE2DA36745F2EEB5CEBA01FB949A1F1EEAB4BC95F72C04283CDA0F3B3F5B9367 X-Mras: Ok Subject: Re: [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 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. --------------5bdE1hC4EUZOqwjlCZTis07S Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Hi, Sergey thanks for the patch! See comments below: I would replace a short commit description with "shrink LUA_PATH environment variable for profiler tests" On 23.09.2024 10:18, 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 | 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() discussed verbally, let's move this to a main foreach: --- a/test/tarantool-tests/CMakeLists.txt +++ b/test/tarantool-tests/CMakeLists.txt @@ -156,16 +156,12 @@ foreach(test_path ${tests})      LABELS ${TEST_SUITE_NAME}      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\;" -  ) +  # 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() --------------5bdE1hC4EUZOqwjlCZTis07S Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 8bit

Hi, Sergey

thanks for the patch! See comments below:


I would replace a short commit description with

"shrink LUA_PATH environment variable for profiler tests"


On 23.09.2024 10:18, 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 | 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 <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
 )
@@ -159,3 +157,15 @@ foreach(test_path ${tests})
     DEPENDS tarantool-tests-deps
   )
 endforeach()
+
+# The part of the profilers toolchain is located in the <tools/>
+# 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()

discussed verbally,

let's move this to a main foreach:


--- a/test/tarantool-tests/CMakeLists.txt
+++ b/test/tarantool-tests/CMakeLists.txt
@@ -156,16 +156,12 @@ foreach(test_path ${tests})
     LABELS ${TEST_SUITE_NAME}
     DEPENDS tarantool-tests-deps
   )
-endforeach()
 
-# The part of the profilers toolchain is located in the <tools/>
-# 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\;"
-  )
+  # 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()


    

  
  


--------------5bdE1hC4EUZOqwjlCZTis07S--