zoe Thu, 16 Jul 2009 16:00:04 +0000
URL: http://svn.php.net/viewvc?view=revision&revision=284191
Changed paths:
U php/phpruntests/trunk/src/testcase/rtTestConfiguration.php
Log:
fixing {PWD} in INI sections
Modified: php/phpruntests/trunk/src/testcase/rtTestConfiguration.php
===================================================================
--- php/phpruntests/trunk/src/testcase/rtTestConfiguration.php 2009-07-16
15:49:57 UTC (rev 284190)
+++ php/phpruntests/trunk/src/testcase/rtTestConfiguration.php 2009-07-16
16:00:04 UTC (rev 284191)
@@ -41,7 +41,7 @@
$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 @@
}
- 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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
