Development

Changeset 2428

You must first sign up to be able to contribute.

Changeset 2428

Show
Ignore:
Timestamp:
10/18/06 09:56:23 (2 years ago)
Author:
fabien
Message:

lime: added more php executable to look for + added -q to php command line

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • tools/lime/lib/lime.php

    r2427 r2428  
    364364      // search in PATH 
    365365      require_once('System.php'); 
    366       $this->php_cli = System::which('php'); 
     366      foreach (array('php5', 'php') as $php_cli) 
     367      { 
     368        if ($this->php_cli = System::which('php5')) 
     369        { 
     370          break; 
     371        } 
     372      } 
    367373 
    368374      if (!is_executable($this->php_cli)) 
    369375      { 
    370         throw new Exception(sprintf("Unable to find PHP (%s).", $this->php_cli)); 
     376        throw new Exception("Unable to find PHP executable."); 
    371377      } 
    372378    } 
    …… 
    404410 
    405411      ob_start(array($this, 'process_test_output'), 2); 
    406       passthru(sprintf('%s "%s" 2>&1', $this->php_cli, $file), $return); 
     412      passthru(sprintf('%s -q "%s" 2>&1', $this->php_cli, $file), $return); 
    407413      ob_end_clean(); 
    408414