Skip to content

Commit

Permalink
- Merge [4526].
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastianbergmann committed Jan 21, 2009
1 parent 45a31a2 commit 59cfb58
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions PHPUnit/Extensions/PhptTestCase.php
Expand Up @@ -93,8 +93,7 @@ class PHPUnit_Extensions_PhptTestCase implements PHPUnit_Framework_Test, PHPUnit
* Constructs a test case with the given filename.
*
* @param string $filename
* @param array $options Array with ini settings for the php instance run,
* key being the name if the setting, value the ini value.
* @param array $options
*/
public function __construct($filename, $options = array())
{
Expand Down Expand Up @@ -133,8 +132,7 @@ public function count()
* Runs a test and collects its result in a TestResult instance.
*
* @param PHPUnit_Framework_TestResult $result
* @param array $options Array with ini settings for the php instance run,
* key being the name if the setting, value the ini value.
* @param array $options
* @return PHPUnit_Framework_TestResult
*/
public function run(PHPUnit_Framework_TestResult $result = NULL, $options = array())
Expand Down Expand Up @@ -162,6 +160,10 @@ public function run(PHPUnit_Framework_TestResult $result = NULL, $options = arra
$coverage = $result->getCollectCodeCoverageInformation();
$options = array_merge($options, $this->options);

if (!isset($options['include_path'])) {
$options['include_path'] = get_include_path();
}

if ($coverage) {
$options['coverage'] = TRUE;
} else {
Expand Down

0 comments on commit 59cfb58

Please sign in to comment.