diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2015-11-10 09:29:35 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2015-11-10 09:29:35 +0100 |
| commit | 9cfed119ff12e5390c006be2be3071820bd0fb69 (patch) | |
| tree | 04c3d7dad3eccfada8e2af3c1473b46034b7a87d /run-tests.php | |
| parent | 0ed6e25e529c9611d95c33ebe5b0a4e41a10b92d (diff) | |
| parent | ccf8b54b89afdf380a2219fab0ac73d199faa54b (diff) | |
| download | php-git-9cfed119ff12e5390c006be2be3071820bd0fb69.tar.gz | |
Merge branch 'PHP-7.0'
Diffstat (limited to 'run-tests.php')
| -rwxr-xr-x | run-tests.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/run-tests.php b/run-tests.php index 6e9bff4f71..be3d3d46f3 100755 --- a/run-tests.php +++ b/run-tests.php @@ -1839,11 +1839,13 @@ TEST $file $env['ZEND_DONT_UNLOAD_MODULES'] = 1; /* --vex-iropt-register-updates=allregs-at-mem-access is necessary for phpdbg watchpoint tests */ - if (version_compare($valgrind_version, '3.3.0', '>=')) { + if (version_compare($valgrind_version, '3.8.0', '>=')) { /* valgrind 3.3.0+ doesn't have --log-file-exactly option */ $cmd = "valgrind -q --tool=memcheck --trace-children=yes --vex-iropt-register-updates=allregs-at-mem-access --log-file=$memcheck_filename $cmd"; + } elseif (version_compare($valgrind_version, '3.3.0', '>=')) { + $cmd = "valgrind -q --tool=memcheck --trace-children=yes --vex-iropt-precise-memory-exns=yes --log-file=$memcheck_filename $cmd"; } else { - $cmd = "valgrind -q --tool=memcheck --trace-children=yes --vex-iropt-register-updates=allregs-at-mem-access --log-file-exactly=$memcheck_filename $cmd"; + $cmd = "valgrind -q --tool=memcheck --trace-children=yes --vex-iropt-precise-memory-exns=yes --log-file-exactly=$memcheck_filename $cmd"; } } else { |