Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'PHP-5.4'
  • Loading branch information
laruence committed Jul 29, 2012
2 parents 32c05f7 + c6ad989 commit 689fda3
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 0 deletions.
3 changes: 3 additions & 0 deletions ext/oci8/tests/pecl_bug10194.phpt
Expand Up @@ -5,6 +5,9 @@ PECL Bug #10194 (segfault in Instant Client when memory_limit is reached inside
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
require(dirname(__FILE__).'/skipif.inc');
if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
if (getenv("USE_ZEND_ALLOC") === "0") {
die("skip Zend MM disabled");
}
?>
--INI--
memory_limit=10M
Expand Down
3 changes: 3 additions & 0 deletions ext/oci8/tests/pecl_bug10194_blob_64.phpt
Expand Up @@ -6,6 +6,9 @@ $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on t
require(dirname(__FILE__).'/skipif.inc');
if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platforms only");
if (getenv("USE_ZEND_ALLOC") === "0") {
die("skip Zend MM disabled");
}
?>
--INI--
memory_limit=6M
Expand Down
5 changes: 5 additions & 0 deletions tests/lang/bug45392.phpt
Expand Up @@ -2,6 +2,11 @@
Bug #45392 (ob_start()/ob_end_clean() and memory_limit)
--INI--
display_errors=stderr
--SKIPIF--
<?php
if (getenv("USE_ZEND_ALLOC") === "0") {
die("skip Zend MM disabled");
}
--FILE--
<?php
echo __LINE__ . "\n";
Expand Down

0 comments on commit 689fda3

Please sign in to comment.