diff options
author | Max Semenik <maxsem.wiki@gmail.com> | 2021-02-25 13:15:03 +0300 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-03-01 11:21:30 +0100 |
commit | bdd7c487646bbaaf4ab5616fa73661f4e9337fa4 (patch) | |
tree | 9ce69aca483addc7d37bf76a733b9885126e8f3d /run-tests.php | |
parent | 1ec7cc96dcba3cd5e243d3c5ac98b9ef0779be38 (diff) | |
download | php-git-bdd7c487646bbaaf4ab5616fa73661f4e9337fa4.tar.gz |
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.
Diffstat (limited to 'run-tests.php')
-rwxr-xr-x | run-tests.php | 8 |
1 files changed, 1 insertions, 7 deletions
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"; } } |