From: Sergey Kaplun via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Maxim Kokryashkin <m.kokryashkin@tarantool.org>, Sergey Bronnikov <sergeyb@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH luajit 4/7] test: shrink LUA_PATH environment variable Date: Mon, 23 Sep 2024 10:18:50 +0300 [thread overview] Message-ID: <2a773d9a5c814c298f1e1ae1f359060cbbc560f4.1727074292.git.skaplun@tarantool.org> (raw) In-Reply-To: <cover.1727074292.git.skaplun@tarantool.org> 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
next prev parent reply other threads:[~2024-09-23 7:21 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-09-23 7:18 [Tarantool-patches] [PATCH luajit 0/7] Shrink test env and fix flaky tests Sergey Kaplun via Tarantool-patches 2024-09-23 7:18 ` [Tarantool-patches] [PATCH luajit 1/7] test: move profilers tests to subdirectory Sergey Kaplun via Tarantool-patches 2024-09-23 7:40 ` Sergey Bronnikov via Tarantool-patches 2024-09-23 7:51 ` Sergey Kaplun via Tarantool-patches 2024-09-23 7:18 ` [Tarantool-patches] [PATCH luajit 2/7] test: rename <arm64-ccall-fp-convention.test.lua> Sergey Kaplun via Tarantool-patches 2024-09-23 7:45 ` Sergey Bronnikov via Tarantool-patches 2024-09-23 7:18 ` [Tarantool-patches] [PATCH luajit 3/7] cmake: introduce AppendTestEnvVar macro Sergey Kaplun via Tarantool-patches 2024-09-23 7:51 ` Sergey Bronnikov via Tarantool-patches 2024-09-23 8:18 ` Sergey Kaplun via Tarantool-patches 2024-09-23 7:18 ` Sergey Kaplun via Tarantool-patches [this message] 2024-09-23 8:47 ` [Tarantool-patches] [PATCH luajit 4/7] test: shrink LUA_PATH environment variable Sergey Bronnikov via Tarantool-patches 2024-09-23 7:18 ` [Tarantool-patches] [PATCH luajit 5/7] test: shrink LUA_CPATH and {DY}LD_LIBRARY_PATH Sergey Kaplun via Tarantool-patches 2024-09-23 7:18 ` [Tarantool-patches] [PATCH luajit 6/7] test: skip flaky tests with enabled table bump Sergey Kaplun via Tarantool-patches 2024-09-23 9:44 ` Sergey Bronnikov via Tarantool-patches 2024-09-23 11:08 ` Sergey Kaplun via Tarantool-patches 2024-09-23 7:18 ` [Tarantool-patches] [PATCH luajit 7/7] test: set LD_PRELOAD only when necessary Sergey Kaplun via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=2a773d9a5c814c298f1e1ae1f359060cbbc560f4.1727074292.git.skaplun@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=m.kokryashkin@tarantool.org \ --cc=sergeyb@tarantool.org \ --cc=skaplun@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH luajit 4/7] test: shrink LUA_PATH environment variable' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox