diff options
| author | Xinchen Hui <laruence@php.net> | 2012-07-29 12:20:05 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-07-29 12:20:05 +0800 |
| commit | 32c05f772e178791091d885c559a45be8e267dd1 (patch) | |
| tree | 89c2ee203708d3d7f66fd05243216173809027e5 | |
| parent | 6583f36a17d2141ff51e65ad2b5759595e773cdc (diff) | |
| parent | 11e84180efeeb7e7443adc4c50a3d7886828994d (diff) | |
| download | php-git-32c05f772e178791091d885c559a45be8e267dd1.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
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') {
|