[Tarantool-patches] [PATCH v2 luajit 1/7] test: move profilers tests to subdirectory

Sergey Kaplun skaplun at tarantool.org
Tue Sep 24 13:29:46 MSK 2024


This patch moves tests for Tarantool's profilers like memprof and
sysprof to the corresponding subdirectory.
It is useful when we want to change the properties for these tests only.

Needed for tarantool/tarantool#9898
---
 test/tarantool-tests/CMakeLists.txt                    | 10 +++++-----
 .../{ => profilers}/gh-5688-tool-cli-flag.test.lua     |  0
 .../gh-5813-resolving-of-c-symbols.test.lua            |  0
 .../gh-5813-resolving-of-c-symbols/both/CMakeLists.txt |  0
 .../gh-5813-resolving-of-c-symbols/both/resboth.c      |  0
 .../gnuhash/CMakeLists.txt                             |  0
 .../gnuhash/resgnuhash.c                               |  0
 .../gh-5813-resolving-of-c-symbols/hash/CMakeLists.txt |  0
 .../gh-5813-resolving-of-c-symbols/hash/reshash.c      |  0
 .../stripped/CMakeLists.txt                            |  0
 .../stripped/resstripped.c                             |  0
 .../gh-5994-memprof-human-readable.test.lua            |  0
 .../gh-7264-add-proto-trace-sysprof-default.test.lua   |  0
 .../gh-9217-profile-parsers-error-handling.test.lua    |  0
 .../{ => profilers}/misclib-memprof-lapi.test.lua      |  0
 .../{ => profilers}/misclib-sysprof-lapi.test.lua      |  0
 .../{ => profilers}/tools-utils-avl.test.lua           |  0
 17 files changed, 5 insertions(+), 5 deletions(-)
 rename test/tarantool-tests/{ => profilers}/gh-5688-tool-cli-flag.test.lua (100%)
 rename test/tarantool-tests/{ => profilers}/gh-5813-resolving-of-c-symbols.test.lua (100%)
 rename test/tarantool-tests/{ => profilers}/gh-5813-resolving-of-c-symbols/both/CMakeLists.txt (100%)
 rename test/tarantool-tests/{ => profilers}/gh-5813-resolving-of-c-symbols/both/resboth.c (100%)
 rename test/tarantool-tests/{ => profilers}/gh-5813-resolving-of-c-symbols/gnuhash/CMakeLists.txt (100%)
 rename test/tarantool-tests/{ => profilers}/gh-5813-resolving-of-c-symbols/gnuhash/resgnuhash.c (100%)
 rename test/tarantool-tests/{ => profilers}/gh-5813-resolving-of-c-symbols/hash/CMakeLists.txt (100%)
 rename test/tarantool-tests/{ => profilers}/gh-5813-resolving-of-c-symbols/hash/reshash.c (100%)
 rename test/tarantool-tests/{ => profilers}/gh-5813-resolving-of-c-symbols/stripped/CMakeLists.txt (100%)
 rename test/tarantool-tests/{ => profilers}/gh-5813-resolving-of-c-symbols/stripped/resstripped.c (100%)
 rename test/tarantool-tests/{ => profilers}/gh-5994-memprof-human-readable.test.lua (100%)
 rename test/tarantool-tests/{ => profilers}/gh-7264-add-proto-trace-sysprof-default.test.lua (100%)
 rename test/tarantool-tests/{ => profilers}/gh-9217-profile-parsers-error-handling.test.lua (100%)
 rename test/tarantool-tests/{ => profilers}/misclib-memprof-lapi.test.lua (100%)
 rename test/tarantool-tests/{ => profilers}/misclib-sysprof-lapi.test.lua (100%)
 rename test/tarantool-tests/{ => profilers}/tools-utils-avl.test.lua (100%)

diff --git a/test/tarantool-tests/CMakeLists.txt b/test/tarantool-tests/CMakeLists.txt
index 0bd3e6fc..11a84496 100644
--- a/test/tarantool-tests/CMakeLists.txt
+++ b/test/tarantool-tests/CMakeLists.txt
@@ -21,10 +21,6 @@ endmacro()
 add_subdirectory(ffi-ccall)
 add_subdirectory(fix-bit-shift-generation)
 add_subdirectory(gh-4427-ffi-sandwich)
-add_subdirectory(gh-5813-resolving-of-c-symbols/both)
-add_subdirectory(gh-5813-resolving-of-c-symbols/hash)
-add_subdirectory(gh-5813-resolving-of-c-symbols/gnuhash)
-add_subdirectory(gh-5813-resolving-of-c-symbols/stripped)
 add_subdirectory(gh-6098-fix-side-exit-patching-on-arm64)
 add_subdirectory(gh-6189-cur_L)
 add_subdirectory(lj-416-xor-before-jcc)
@@ -38,6 +34,10 @@ add_subdirectory(lj-flush-on-trace)
 add_subdirectory(lj-1004-oom-error-frame)
 add_subdirectory(lj-1066-fix-cur_L-after-coroutine-resume)
 add_subdirectory(lj-1166-error-stitch)
+add_subdirectory(profilers/gh-5813-resolving-of-c-symbols/both)
+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
@@ -121,7 +121,7 @@ add_test_suite_target(tarantool-tests
 
 file(GLOB_RECURSE tests ${CMAKE_CURRENT_SOURCE_DIR} "*${LUA_TEST_SUFFIX}")
 foreach(test_path ${tests})
-  get_filename_component(test_name ${test_path} NAME)
+  file(RELATIVE_PATH test_name ${CMAKE_CURRENT_SOURCE_DIR} ${test_path})
   set(test_title "test/${TEST_SUITE_NAME}/${test_name}")
   add_test(NAME ${test_title}
     COMMAND ${LUAJIT_TEST_COMMAND} ${test_path}
diff --git a/test/tarantool-tests/gh-5688-tool-cli-flag.test.lua b/test/tarantool-tests/profilers/gh-5688-tool-cli-flag.test.lua
similarity index 100%
rename from test/tarantool-tests/gh-5688-tool-cli-flag.test.lua
rename to test/tarantool-tests/profilers/gh-5688-tool-cli-flag.test.lua
diff --git a/test/tarantool-tests/gh-5813-resolving-of-c-symbols.test.lua b/test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols.test.lua
similarity index 100%
rename from test/tarantool-tests/gh-5813-resolving-of-c-symbols.test.lua
rename to test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols.test.lua
diff --git a/test/tarantool-tests/gh-5813-resolving-of-c-symbols/both/CMakeLists.txt b/test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols/both/CMakeLists.txt
similarity index 100%
rename from test/tarantool-tests/gh-5813-resolving-of-c-symbols/both/CMakeLists.txt
rename to test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols/both/CMakeLists.txt
diff --git a/test/tarantool-tests/gh-5813-resolving-of-c-symbols/both/resboth.c b/test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols/both/resboth.c
similarity index 100%
rename from test/tarantool-tests/gh-5813-resolving-of-c-symbols/both/resboth.c
rename to test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols/both/resboth.c
diff --git a/test/tarantool-tests/gh-5813-resolving-of-c-symbols/gnuhash/CMakeLists.txt b/test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols/gnuhash/CMakeLists.txt
similarity index 100%
rename from test/tarantool-tests/gh-5813-resolving-of-c-symbols/gnuhash/CMakeLists.txt
rename to test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols/gnuhash/CMakeLists.txt
diff --git a/test/tarantool-tests/gh-5813-resolving-of-c-symbols/gnuhash/resgnuhash.c b/test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols/gnuhash/resgnuhash.c
similarity index 100%
rename from test/tarantool-tests/gh-5813-resolving-of-c-symbols/gnuhash/resgnuhash.c
rename to test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols/gnuhash/resgnuhash.c
diff --git a/test/tarantool-tests/gh-5813-resolving-of-c-symbols/hash/CMakeLists.txt b/test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols/hash/CMakeLists.txt
similarity index 100%
rename from test/tarantool-tests/gh-5813-resolving-of-c-symbols/hash/CMakeLists.txt
rename to test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols/hash/CMakeLists.txt
diff --git a/test/tarantool-tests/gh-5813-resolving-of-c-symbols/hash/reshash.c b/test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols/hash/reshash.c
similarity index 100%
rename from test/tarantool-tests/gh-5813-resolving-of-c-symbols/hash/reshash.c
rename to test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols/hash/reshash.c
diff --git a/test/tarantool-tests/gh-5813-resolving-of-c-symbols/stripped/CMakeLists.txt b/test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols/stripped/CMakeLists.txt
similarity index 100%
rename from test/tarantool-tests/gh-5813-resolving-of-c-symbols/stripped/CMakeLists.txt
rename to test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols/stripped/CMakeLists.txt
diff --git a/test/tarantool-tests/gh-5813-resolving-of-c-symbols/stripped/resstripped.c b/test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols/stripped/resstripped.c
similarity index 100%
rename from test/tarantool-tests/gh-5813-resolving-of-c-symbols/stripped/resstripped.c
rename to test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols/stripped/resstripped.c
diff --git a/test/tarantool-tests/gh-5994-memprof-human-readable.test.lua b/test/tarantool-tests/profilers/gh-5994-memprof-human-readable.test.lua
similarity index 100%
rename from test/tarantool-tests/gh-5994-memprof-human-readable.test.lua
rename to test/tarantool-tests/profilers/gh-5994-memprof-human-readable.test.lua
diff --git a/test/tarantool-tests/gh-7264-add-proto-trace-sysprof-default.test.lua b/test/tarantool-tests/profilers/gh-7264-add-proto-trace-sysprof-default.test.lua
similarity index 100%
rename from test/tarantool-tests/gh-7264-add-proto-trace-sysprof-default.test.lua
rename to test/tarantool-tests/profilers/gh-7264-add-proto-trace-sysprof-default.test.lua
diff --git a/test/tarantool-tests/gh-9217-profile-parsers-error-handling.test.lua b/test/tarantool-tests/profilers/gh-9217-profile-parsers-error-handling.test.lua
similarity index 100%
rename from test/tarantool-tests/gh-9217-profile-parsers-error-handling.test.lua
rename to test/tarantool-tests/profilers/gh-9217-profile-parsers-error-handling.test.lua
diff --git a/test/tarantool-tests/misclib-memprof-lapi.test.lua b/test/tarantool-tests/profilers/misclib-memprof-lapi.test.lua
similarity index 100%
rename from test/tarantool-tests/misclib-memprof-lapi.test.lua
rename to test/tarantool-tests/profilers/misclib-memprof-lapi.test.lua
diff --git a/test/tarantool-tests/misclib-sysprof-lapi.test.lua b/test/tarantool-tests/profilers/misclib-sysprof-lapi.test.lua
similarity index 100%
rename from test/tarantool-tests/misclib-sysprof-lapi.test.lua
rename to test/tarantool-tests/profilers/misclib-sysprof-lapi.test.lua
diff --git a/test/tarantool-tests/tools-utils-avl.test.lua b/test/tarantool-tests/profilers/tools-utils-avl.test.lua
similarity index 100%
rename from test/tarantool-tests/tools-utils-avl.test.lua
rename to test/tarantool-tests/profilers/tools-utils-avl.test.lua
-- 
2.46.0



More information about the Tarantool-patches mailing list