From bc7d88cc8af57db233b5a48c57bcd3b383591779 Mon Sep 17 00:00:00 2001 From: Yedaya Katsman Date: Wed, 4 Jun 2025 21:22:35 +0300 Subject: [PATCH] tests: torture: don't duplicate valgrind command When running torture tests with valgrind enabled, the torture function got a command line that already had the valgrind invocation in it. It added another, at the end resulting in an empty valgrind log file. Remove the duplicate logic adding valgrind, which already had a bit of different logic that wasn't updated when the other one was. Closes #17501 --- tests/runner.pm | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/tests/runner.pm b/tests/runner.pm index f85a1925ec..da26efb346 100644 --- a/tests/runner.pm +++ b/tests/runner.pm @@ -502,19 +502,6 @@ sub torture { unlink("$LOGDIR/$MEMDUMP"); my $cmd = $testcmd; - if($valgrind && !$gdbthis) { - my @valgrindoption = getpart("verify", "valgrind"); - if((!@valgrindoption) || ($valgrindoption[0] !~ /disable/)) { - my $valgrindcmd = shell_quote($valgrind) . " "; - $valgrindcmd .= "$valgrind_tool " if($valgrind_tool); - $valgrindcmd .= "--quiet --leak-check=yes "; - $valgrindcmd .= "--suppressions=$srcdir/valgrind.supp "; - # $valgrindcmd .= "--gen-suppressions=all "; - $valgrindcmd .= "--num-callers=16 "; - $valgrindcmd .= "${valgrind_logfile}=$LOGDIR/valgrind$testnum"; - $cmd = "$valgrindcmd $testcmd"; - } - } logmsg "*** Function number $limit is now set to fail ***\n" if($gdbthis); my $ret = 0; -- 2.47.3