From: Max Semenik <maxsem.wiki@gmail.com>
Date: Thu, 25 Feb 2021 10:15:03 +0000 (+0300)
Subject: run-tests: drop support for ancient Valgrind versions
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bdd7c487646bbaaf4ab5616fa73661f4e9337fa4;p=php

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.

Closes GH-6728.
---

diff --git a/run-tests.php b/run-tests.php
index 90418df584..e6ed2a169e 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -3792,7 +3792,6 @@ class RuntestsValgrind
 {
     protected $version = '';
     protected $header = '';
-    protected $version_3_3_0 = false;
     protected $version_3_8_0 = false;
     protected $tool = null;
 
@@ -3822,7 +3821,6 @@ class RuntestsValgrind
         $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', '>=');
     }
 
@@ -3835,13 +3833,9 @@ class RuntestsValgrind
 
         /* --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";
     }
 }