diff options
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"; } } |