summaryrefslogtreecommitdiff
path: root/modules/unit_test/libraries
diff options
context:
space:
mode:
authormamouneyya <mamoun.diraneyya@gmail.com>2011-02-16 18:25:18 +0300
committermamouneyya <mamoun.diraneyya@gmail.com>2011-02-16 18:25:18 +0300
commit00772aaa62e6bce14e58e163ea72f386136c731d (patch)
treeed658d454d8bea79d551969fffa0bc18faee5d52 /modules/unit_test/libraries
parent3e2610ea83c60805d5e727df6509da6c49fd6c7b (diff)
parentd2c77fd0590501f7b6b51d9f4cc033ed9485b082 (diff)
Merge remote-tracking branch 'gallery3/master'
Diffstat (limited to 'modules/unit_test/libraries')
-rw-r--r--modules/unit_test/libraries/Unit_Test.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/unit_test/libraries/Unit_Test.php b/modules/unit_test/libraries/Unit_Test.php
index 46a926d8..253d6fb6 100644
--- a/modules/unit_test/libraries/Unit_Test.php
+++ b/modules/unit_test/libraries/Unit_Test.php
@@ -185,6 +185,8 @@ class Unit_Test_Core {
$e = null;
try {
+ // Enforce a time limit
+ set_time_limit(30);
// Run the actual test
$object->$method_name();