summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2012-05-01 14:33:57 -0700
committerChristopher Jones <sixd@php.net>2012-05-01 14:33:57 -0700
commit02e25df8b5a7c60364c7153c03da59de3a556a87 (patch)
tree7c6d75486400793b6779e1d69f9aa609f9940ac2
parentd26e006d7f01db6fab3942ebbf073beaabf57e2d (diff)
parentc864b1ca2f7bfaee43795085df7ee5b739c9aa5f (diff)
downloadphp-git-02e25df8b5a7c60364c7153c03da59de3a556a87.tar.gz
Merge branch 'fix-bug61115-1.phpt-for-no-debug' into PHP-5.3
* fix-bug61115-1.phpt-for-no-debug: Fix masking in bug61115-1.phpt
-rw-r--r--ext/standard/tests/streams/bug61115-1.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/tests/streams/bug61115-1.phpt b/ext/standard/tests/streams/bug61115-1.phpt
index 573496edf0..89374e7353 100644
--- a/ext/standard/tests/streams/bug61115-1.phpt
+++ b/ext/standard/tests/streams/bug61115-1.phpt
@@ -8,4 +8,4 @@ stream_context_get_options($fileResourceTemp);
ftruncate($fileResourceTemp, PHP_INT_MAX);
?>
--EXPECTF--
-Fatal error: Allowed memory size of %d bytes exhausted %s (tried to allocate %d bytes) in %s on line %d
+Fatal error: Allowed memory size of %d bytes exhausted%s(tried to allocate %d bytes) in %s on line %d