diff options
| author | David Rothstein <drothstein@gmail.com> | 2013-08-05 23:58:15 -0400 |
|---|---|---|
| committer | David Rothstein <drothstein@gmail.com> | 2013-08-05 23:58:15 -0400 |
| commit | 19e65b966c79e7061827ef5f21ac67cd1159806c (patch) | |
| tree | f5715889843ee7c991ff70083f31b2a55a0a2656 /modules/simpletest/simpletest.install | |
| parent | ebe236b0c03750c624cd00db96fc535077e6f890 (diff) | |
| download | brdo-19e65b966c79e7061827ef5f21ac67cd1159806c.tar.gz brdo-19e65b966c79e7061827ef5f21ac67cd1159806c.tar.bz2 | |
Issue #1453984 by xjm, naxoc, Dave Reid, underq, dags, tim.plunkett, Heine: Fixed Color module doesn't test for unlimited memory.
Diffstat (limited to 'modules/simpletest/simpletest.install')
| -rw-r--r-- | modules/simpletest/simpletest.install | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/simpletest/simpletest.install b/modules/simpletest/simpletest.install index ea847f4ea..6c6f5694d 100644 --- a/modules/simpletest/simpletest.install +++ b/modules/simpletest/simpletest.install @@ -63,7 +63,7 @@ function simpletest_requirements($phase) { // Check the current memory limit. If it is set too low, SimpleTest will fail // to load all tests and throw a fatal error. $memory_limit = ini_get('memory_limit'); - if ($memory_limit && $memory_limit != -1 && parse_size($memory_limit) < parse_size(SIMPLETEST_MINIMUM_PHP_MEMORY_LIMIT)) { + if (!drupal_check_memory_limit(SIMPLETEST_MINIMUM_PHP_MEMORY_LIMIT, $memory_limit)) { $requirements['php_memory_limit']['severity'] = REQUIREMENT_ERROR; $requirements['php_memory_limit']['description'] = $t('The testing framework requires the PHP memory limit to be at least %memory_minimum_limit. The current value is %memory_limit. <a href="@url">Follow these steps to continue</a>.', array('%memory_limit' => $memory_limit, '%memory_minimum_limit' => SIMPLETEST_MINIMUM_PHP_MEMORY_LIMIT, '@url' => 'http://drupal.org/node/207036')); } |