summaryrefslogtreecommitdiffstats
path: root/tests/Bootstrap.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-01-12 16:23:26 +0100
committerAndrey Andreev <narf@devilix.net>2015-01-12 16:23:26 +0100
commit45a8afaabc6d09ad59bbb3c89a6cdfe8cbc3312c (patch)
tree7ca4207099f9225b5ef74b31f48627a282e7fdf2 /tests/Bootstrap.php
parentcd94dd7e1d8969658810ccc4158a75d2936d0a44 (diff)
parent934d6d9797f4dadd4e4d05b12bc4d7309fedb6c3 (diff)
Merge branch 'develop' into feature/session
Diffstat (limited to 'tests/Bootstrap.php')
-rw-r--r--tests/Bootstrap.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index 713c0fdb3..8240d2340 100644
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -1,4 +1,9 @@
<?php
+// For some reason, setting this fixes the 5.2 tests but breaks the 5.3 ones ...
+if (version_compare(PHP_VERSION, '5.3.0', '<'))
+{
+ ini_set('memory_limit', '128M');
+}
// Errors on full!
ini_set('display_errors', 1);