From ecd08cf1e986d258b87855def4f7336c98c23869 Mon Sep 17 00:00:00 2001 From: Max Semenik Date: Thu, 25 Feb 2021 13:15:03 +0300 Subject: [PATCH] run-tests: drop support for ancient Valgrind versions Valgrind 3.3.0 was released in 2007, not even RHEL has crap older than this. It could be argued that 3.8.0, released in 2012, could be a safe cutoff too. --- run-tests.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/run-tests.php b/run-tests.php index f6819f95d81ae..7452e81d65545 100755 --- a/run-tests.php +++ b/run-tests.php @@ -3789,7 +3789,6 @@ class RuntestsValgrind { protected $version = ''; protected $header = ''; - protected $version_3_3_0 = false; protected $version_3_8_0 = false; protected $tool = null; @@ -3819,7 +3818,6 @@ public function __construct(array $environment, string $tool = 'memcheck') $this->version = $version; $this->header = sprintf( "%s (%s)", trim($header), $this->tool); - $this->version_3_3_0 = version_compare($version, '3.3.0', '>='); $this->version_3_8_0 = version_compare($version, '3.8.0', '>='); } @@ -3832,13 +3830,9 @@ public function wrapCommand(string $cmd, string $memcheck_filename, bool $check_ /* --vex-iropt-register-updates=allregs-at-mem-access is necessary for phpdbg watchpoint tests */ if ($this->version_3_8_0) { - /* valgrind 3.3.0+ doesn't have --log-file-exactly option */ return "$vcmd --vex-iropt-register-updates=allregs-at-mem-access --log-file=$memcheck_filename $cmd"; - } elseif ($this->version_3_3_0) { - return "$vcmd --vex-iropt-precise-memory-exns=yes --log-file=$memcheck_filename $cmd"; - } else { - return "$vcmd --vex-iropt-precise-memory-exns=yes --log-file-exactly=$memcheck_filename $cmd"; } + return "$vcmd --vex-iropt-precise-memory-exns=yes --log-file=$memcheck_filename $cmd"; } }