com phpruntests: fixing {PWD} in INI sections: src/testcase/rtTestConfiguration.php
| From: | David Soria Parra | Date: | Thu, 16 Jul 2009 16:00:04 +0000 |
| Subject: | com phpruntests: fixing {PWD} in INI sections: src/testcase/rtTestConfiguration.php | ||
| Groups: | php.qa | ||
| Request: | Send a blank email to php-qa+get-66334@lists.php.net to get a copy of this message | ||
Commit: 16e2c2143607bbf51bdff2699360eeb505c885c5
Author: Zoe Slattery <zoe@php.net> Thu, 16 Jul 2009 16:00:04 +0000
Parents: 650bf7f1788c62a946b206044fa58c453b7c8d8d
Branches: master
Link: http://git.php.net/?p=phpruntests.git;a=commitdiff;h=16e2c2143607bbf51bdff2699360eeb505c885c5
Log:
fixing {PWD} in INI sections
Changed paths:
M src/testcase/rtTestConfiguration.php
Diff:
diff --git a/src/testcase/rtTestConfiguration.php b/src/testcase/rtTestConfiguration.php
index b7772c4..6d2e759 100644
--- a/src/testcase/rtTestConfiguration.php
+++ b/src/testcase/rtTestConfiguration.php
@@ -41,7 +41,7 @@ class rtTestConfiguration
$this->setCgiTest($sectionHeadings);
$this->setEnvironmentVariables($runConfiguration, $sections, $fileSection);
- $this->setPhpCommandLineArguments($runConfiguration, $sections);
+ $this->setPhpCommandLineArguments($runConfiguration, $sections, $fileSection);
$this->setTestCommandLineArguments($sections);
$this->setPhpExecutable($runConfiguration, $sectionHeadings);
$this->setInputFileString($runConfiguration, $sections, $sectionHeadings);
@@ -86,10 +86,11 @@ class rtTestConfiguration
}
- private function setPhpCommandLineArguments(rtRuntestsConfiguration $runConfiguration,
$sections)
+ private function setPhpCommandLineArguments(rtRuntestsConfiguration $runConfiguration,
$sections, $fileSection)
{
$this->phpCommandLineArguments =
$runConfiguration->getSetting('PhpCommandLineArguments');
if (array_key_exists('INI', $sections)) {
+ $sections['INI']->substitutePWD($fileSection->getFileName());
$additionalArguments = $sections['INI']->getCommandLineArguments();
$args = new rtIniAsCommandLineArgs();
$this->phpCommandLineArguments = $args->settingsToArguments($additionalArguments,
$this->phpCommandLineArguments);