Skip to content

Commit da14cdd

Browse files
committed
Merge branch 'skip-memory-exhaust-tests' of https://github.com/reeze/php-src into PHP-5.3
2 parents 7aed239 + 0239437 commit da14cdd

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

ext/oci8/tests/pecl_bug10194_blob.phpt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on t
66
require(dirname(__FILE__).'/skipif.inc');
77
if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platforms only");
88
if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
9+
if (getenv("USE_ZEND_ALLOC") === "0") {
10+
die("skip Zend MM disabled");
11+
}
912
?>
1013
--INI--
1114
memory_limit=3M

ext/standard/tests/strings/str_pad_variation5.phpt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ memory_limit=128M
55
--SKIPIF--
66
<?php
77
if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
8+
if (getenv("USE_ZEND_ALLOC") === "0") {
9+
die("skip Zend MM disabled");
10+
}
811
?>
912
--FILE--
1013
<?php

0 commit comments

Comments
 (0)