Hi, Maxim, thanks for the patch! See comments below. On 12.09.2024 13:21, mandesero--- via Tarantool-patches wrote: > From: Maksim Tiushev > > This patch disables the following tests when running with Valgrind due to > failures: > > For SIGPROF: s/SIGPROF/sysprof/ > - test/tarantool-tests/gh-7264-add-proto-trace-sysprof-default.test.lua > - test/tarantool-tests/lj-512-profiler-hook-finalizers.test.lua > - test/tarantool-tests/lj-726-profile-flush-close.test.lua > > For TIMEOUT: > - test/tarantool-tests/gh-7745-oom-on-trace.test.lua > - test/tarantool-tests/lj-1034-tabov-error-frame.test.lua > > For FLAKY: > - test/tarantool-tests/misclib-sysprof-lapi.test.lua it is a sysprof test, why it is in a separate category? > --- > test/tarantool-tests/CMakeLists.txt | 3 ++- > .../gh-7264-add-proto-trace-sysprof-default.test.lua | 1 + > test/tarantool-tests/gh-7745-oom-on-trace.test.lua | 1 + > test/tarantool-tests/lj-1034-tabov-error-frame.test.lua | 1 + > test/tarantool-tests/lj-512-profiler-hook-finalizers.test.lua | 4 +++- > test/tarantool-tests/lj-726-profile-flush-close.test.lua | 4 +++- > test/tarantool-tests/misclib-sysprof-lapi.test.lua | 1 + > 7 files changed, 12 insertions(+), 3 deletions(-) > > diff --git a/test/tarantool-tests/CMakeLists.txt b/test/tarantool-tests/CMakeLists.txt > index e3750bf3..2becebb7 100644 > --- a/test/tarantool-tests/CMakeLists.txt > +++ b/test/tarantool-tests/CMakeLists.txt > @@ -130,7 +130,8 @@ foreach(test_path ${tests}) > # LUA_CPATH and LD_LIBRARY_PATH variables and also > # dependencies list with libraries are set in scope of > # BuildTestLib macro. > - ENVIRONMENT "LUA_PATH=${LUA_PATH};LUA_CPATH=${LUA_CPATH};${LUA_TEST_ENV_MORE}" > + ENVIRONMENT "LUA_PATH=${LUA_PATH};LUA_CPATH=${LUA_CPATH};${LUA_TEST_ENV_MORE};\ > +LJ_USE_VALGRIND=${LUAJIT_USE_VALGRIND}" > LABELS ${TEST_SUITE_NAME} > DEPENDS tarantool-tests-deps > ) > diff --git a/test/tarantool-tests/gh-7264-add-proto-trace-sysprof-default.test.lua b/test/tarantool-tests/gh-7264-add-proto-trace-sysprof-default.test.lua > index c1d68e3c..f700b414 100644 > --- a/test/tarantool-tests/gh-7264-add-proto-trace-sysprof-default.test.lua > +++ b/test/tarantool-tests/gh-7264-add-proto-trace-sysprof-default.test.lua > @@ -4,6 +4,7 @@ local test = tap.test('gh-7264-add-proto-trace-sysprof-default'):skipcond({ > ['Sysprof is implemented for x86_64 only'] = jit.arch ~= 'x86' and > jit.arch ~= 'x64', > ['Sysprof is implemented for Linux only'] = jit.os ~= 'Linux', > + ['Disabled with Valgrind (SIGPROF)'] = os.getenv("LJ_USE_VALGRIND") == 'ON', > }) > > test:plan(2) > diff --git a/test/tarantool-tests/gh-7745-oom-on-trace.test.lua b/test/tarantool-tests/gh-7745-oom-on-trace.test.lua > index fe320251..b4ab8872 100644 > --- a/test/tarantool-tests/gh-7745-oom-on-trace.test.lua > +++ b/test/tarantool-tests/gh-7745-oom-on-trace.test.lua > @@ -6,6 +6,7 @@ local test = tap.test('OOM on trace'):skipcond({ > (jit.os == 'OSX'), > ['Disabled on MacOS due to #8652'] = jit.os == 'OSX', > ['Test requires JIT enabled'] = not jit.status(), > + ['Disabled with Valgrind (Timeout)'] = os.getenv("LJ_USE_VALGRIND") == 'ON', > }) > > test:plan(1) > diff --git a/test/tarantool-tests/lj-1034-tabov-error-frame.test.lua b/test/tarantool-tests/lj-1034-tabov-error-frame.test.lua > index 0e23fdb2..5e75973b 100644 > --- a/test/tarantool-tests/lj-1034-tabov-error-frame.test.lua > +++ b/test/tarantool-tests/lj-1034-tabov-error-frame.test.lua > @@ -4,6 +4,7 @@ local test = tap.test('lj-1034-tabov-error-frame'):skipcond({ > ['Test requires JIT enabled'] = not jit.status(), > ['Test requires GC64 mode enabled'] = not ffi.abi('gc64'), > ['Disabled on MacOS due to #8652'] = jit.os == 'OSX', > + ['Disabled with Valgrind (Timeout)'] = os.getenv("LJ_USE_VALGRIND") == 'ON', > }) > > -- XXX: The test for the problem uses the table of GC > diff --git a/test/tarantool-tests/lj-512-profiler-hook-finalizers.test.lua b/test/tarantool-tests/lj-512-profiler-hook-finalizers.test.lua > index f02bd05f..fc2f43b7 100644 > --- a/test/tarantool-tests/lj-512-profiler-hook-finalizers.test.lua > +++ b/test/tarantool-tests/lj-512-profiler-hook-finalizers.test.lua > @@ -1,7 +1,9 @@ > local tap = require('tap') > local profile = require('jit.profile') > > -local test = tap.test('lj-512-profiler-hook-finalizers') > +local test = tap.test('lj-512-profiler-hook-finalizers'):skipcond({ > + ['Disabled with Valgrind (SIGPROF)'] = os.getenv("LJ_USE_VALGRIND") == 'ON', > +}) > test:plan(1) > > -- Sampling interval in ms. > diff --git a/test/tarantool-tests/lj-726-profile-flush-close.test.lua b/test/tarantool-tests/lj-726-profile-flush-close.test.lua > index 36cca43d..6d09658f 100644 > --- a/test/tarantool-tests/lj-726-profile-flush-close.test.lua > +++ b/test/tarantool-tests/lj-726-profile-flush-close.test.lua > @@ -1,6 +1,8 @@ > local tap = require('tap') > > -local test = tap.test('lj-726-profile-flush-close') > +local test = tap.test('lj-726-profile-flush-close'):skipcond({ > + ['Disabled with Valgrind (SIGPROF)'] = os.getenv("LJ_USE_VALGRIND") == 'ON', > +}) > test:plan(1) > > local TEST_FILE = 'lj-726-profile-flush-close.profile' > diff --git a/test/tarantool-tests/misclib-sysprof-lapi.test.lua b/test/tarantool-tests/misclib-sysprof-lapi.test.lua > index fdaed46a..79884710 100644 > --- a/test/tarantool-tests/misclib-sysprof-lapi.test.lua > +++ b/test/tarantool-tests/misclib-sysprof-lapi.test.lua > @@ -3,6 +3,7 @@ local test = tap.test("misc-sysprof-lapi"):skipcond({ > ["Sysprof is implemented for x86_64 only"] = jit.arch ~= "x86" and > jit.arch ~= "x64", > ["Sysprof is implemented for Linux only"] = jit.os ~= "Linux", > + ['Disabled with Valgrind (Flaky)'] = os.getenv("LJ_USE_VALGRIND") == 'ON', > }) > > test:plan(19)