diff options
| author | Xinchen Hui <laruence@php.net> | 2012-07-29 12:19:28 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-07-29 12:19:28 +0800 |
| commit | 11e84180efeeb7e7443adc4c50a3d7886828994d (patch) | |
| tree | af5bc91228d0d282fdcfa007407e72ddefce38a3 | |
| parent | b26749b4e92cd7f6dd7e4078a933758fad6647d3 (diff) | |
| parent | 14cebefb058ec4f78d61a5a520da699b121fb306 (diff) | |
| download | php-git-11e84180efeeb7e7443adc4c50a3d7886828994d.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Skip test while zend_mm is disabled
| -rw-r--r-- | Zend/tests/bug55509.phpt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Zend/tests/bug55509.phpt b/Zend/tests/bug55509.phpt index b78fceb0da..5268789df6 100644 --- a/Zend/tests/bug55509.phpt +++ b/Zend/tests/bug55509.phpt @@ -5,6 +5,12 @@ Bug #55509 (segfault on x86_64 using more than 2G memory) if (PHP_INT_SIZE == 4) {
die('skip Not for 32-bits OS');
}
+
+$zend_mm_enabled = getenv("USE_ZEND_ALLOC");
+if ($zend_mm_enabled === "0") {
+ die("skip Zend MM disabled");
+}
+
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
// check the available memory
if (PHP_OS == 'Linux') {
|