com php-src: Skip test while zend mm is disabled: ext/oci8/te sts/pecl_bug10194.phpt ext/oci8/tests/pecl_ bug10194_blob_64.phpt tests/lang/bug4
5392.phpt
| From: | Xinchen Hui | Date: | Sun, 29 Jul 2012 05:25:31 +0000 |
| Subject: | com php-src: Skip test while zend mm is disabled: ext/oci8/te sts/pecl_bug10194.phpt ext/oci8/tests/pecl_ bug10194_blob_64.phpt tests/lang/bug4 5392.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-69725@lists.php.net to get a copy of this message | ||
Commit: 880a6cee0068e980fd1eed735675d9b7d37968a0
Author: Xinchen Hui <laruence@php.net> Sun, 29 Jul 2012 13:25:31 +0800
Parents: 14cebefb058ec4f78d61a5a520da699b121fb306
Branches: PHP-5.3
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=880a6cee0068e980fd1eed735675d9b7d37968a0
Log:
Skip test while zend mm is disabled
Changed paths:
M ext/oci8/tests/pecl_bug10194.phpt
M ext/oci8/tests/pecl_bug10194_blob_64.phpt
M tests/lang/bug45392.phpt
Diff:
diff --git a/ext/oci8/tests/pecl_bug10194.phpt b/ext/oci8/tests/pecl_bug10194.phpt
index 9947e15..3c1c788 100644
--- a/ext/oci8/tests/pecl_bug10194.phpt
+++ b/ext/oci8/tests/pecl_bug10194.phpt
@@ -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
diff --git a/ext/oci8/tests/pecl_bug10194_blob_64.phpt b/ext/oci8/tests/pecl_bug10194_blob_64.phpt
index 45788a4..e1a4cc0 100644
--- a/ext/oci8/tests/pecl_bug10194_blob_64.phpt
+++ b/ext/oci8/tests/pecl_bug10194_blob_64.phpt
@@ -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
diff --git a/tests/lang/bug45392.phpt b/tests/lang/bug45392.phpt
index ae84cd9..78876c7 100644
--- a/tests/lang/bug45392.phpt
+++ b/tests/lang/bug45392.phpt
@@ -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";