Set timeout to 0 for Travis.

migueldvb · Feb 10, 2014 · 359580d · 359580d
1 parent 1d8e2e2
commit 359580d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -59,9 +59,6 @@ before_script:
   - drush solr-mark-all
   - drush solr-index
 
-  # Make sure emails are not sent.
-  - php -r "print json_encode(array('default-system' => 'DevelMailLog', 'mimemail' => 'MimeMailSystem'));" | drush vset --format=json mail_system -
-
   # Copy Behat configuration file.
   - cd profiles/openscholar/behat
   - cp behat.local.yml.travis behat.local.yml

diff --git a/scripts/setup b/scripts/setup
@@ -34,6 +34,8 @@ ini_set('session.gc_divisor', 100);
 ini_set('session.gc_maxlifetime', 200000);
 ini_set('session.cookie_lifetime', 2000000);
 
+ini_set('max_execution_time', 0);
+
 /**
  * Fast 404 pages:
  */
@@ -52,7 +54,7 @@ ini_set('session.cookie_lifetime', 2000000);
 );
 
 // Use Devel to redirect SMTP to file.
-\$conf['mail_system'] = array('default-system' => 'DevelMailLog');
+\$conf['mail_system'] = array('default-system' => 'DevelMailLog', 'mimemail' => 'MimeMailSystem');
 
 EOF