summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2015-06-11 17:06:46 +0200
committerAnatol Belski <ab@php.net>2015-06-11 17:06:46 +0200
commit702e349df4ef3cc91927efc0fc5caf0b59cd96e8 (patch)
treef649c216c9acb3ab3edf2841ed81ef4e5c87477d /ext
parentd777669679f5284d3bb6c970c2575fa85f1e4460 (diff)
parenta037b6de213c0326bcff486d9608a56965059725 (diff)
downloadphp-git-702e349df4ef3cc91927efc0fc5caf0b59cd96e8.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: rework that test to allow delta for rounding errors
Diffstat (limited to 'ext')
-rw-r--r--ext/pdo_pgsql/tests/bug69752.phpt3
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/pdo_pgsql/tests/bug69752.phpt b/ext/pdo_pgsql/tests/bug69752.phpt
index 6cf9a0a928..bb7e5e87e7 100644
--- a/ext/pdo_pgsql/tests/bug69752.phpt
+++ b/ext/pdo_pgsql/tests/bug69752.phpt
@@ -42,7 +42,8 @@ for($i = 0; $i < $max; $i++) {
if ($first_time_usage === null) $first_time_usage = $usage;
- if ($first_time_usage != $usage){
+ /* Use delta instead of direct comparison here */
+ if (abs($first_time_usage - $usage) > 3){
printf("Memory Leak Detected: %d != %d\n", $usage, $first_time_usage);
break;
}