[Tarantool-patches] [PATCH luajit 4/7] test: shrink LUA_PATH environment variable

Sergey Kaplun skaplun at tarantool.org
Mon Sep 23 10:18:50 MSK 2024


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()
-- 
2.46.0



More information about the Tarantool-patches mailing list