zoe Sun Apr 26 22:43:36 2009 UTC Modified files: /phpruntests/src/testcase rtPhpTest.php rtTestConfiguration.php Log: Changes to enable GET http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtPhpTest.php?r1=1.3&r2=1.4&diff_format=u Index: phpruntests/src/testcase/rtPhpTest.php diff -u phpruntests/src/testcase/rtPhpTest.php:1.3 phpruntests/src/testcase/rtPhpTest.php:1.4 --- phpruntests/src/testcase/rtPhpTest.php:1.3 Sat Apr 25 15:04:23 2009 +++ phpruntests/src/testcase/rtPhpTest.php Sun Apr 26 22:43:36 2009 @@ -60,11 +60,13 @@ //Identify the file and expect section types $this->fileSection = $this->setFileSection(); $this->expectSection = $this->setExpectSection(); + + $this->fileSection->setExecutableFileName($this->getName()); } public function init(rtRuntestsConfiguration $runConfiguration) { - $this->testConfiguration = new rtTestConfiguration($runConfiguration, $this->sections, $this->sectionHeadings); + $this->testConfiguration = new rtTestConfiguration($runConfiguration, $this->sections, $this->sectionHeadings, $this->fileSection); } //run http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestConfiguration.php?r1=1.5&r2=1.6&diff_format=u Index: phpruntests/src/testcase/rtTestConfiguration.php diff -u phpruntests/src/testcase/rtTestConfiguration.php:1.5 phpruntests/src/testcase/rtTestConfiguration.php:1.6 --- phpruntests/src/testcase/rtTestConfiguration.php:1.5 Sun Apr 26 07:40:57 2009 +++ phpruntests/src/testcase/rtTestConfiguration.php Sun Apr 26 22:43:36 2009 @@ -21,6 +21,7 @@ private $phpCommandLineArguments; private $testCommandLineArguments; private $phpExecutable; + private $isCgiTest = false; private $cgiSections = array( 'GET', 'POST', @@ -31,20 +32,29 @@ 'COOKIE', ); - public function __construct(rtRuntestsConfiguration $runConfiguration, $sections, $sectionHeadings) + public function __construct(rtRuntestsConfiguration $runConfiguration, $sections, $sectionHeadings, $fileSection) { - $this->init($runConfiguration, $sections, $sectionHeadings); + $this->init($runConfiguration, $sections, $sectionHeadings, $fileSection); } - private function init(rtRuntestsConfiguration $runConfiguration, $sections, $sectionHeadings) + private function init(rtRuntestsConfiguration $runConfiguration, $sections, $sectionHeadings, $fileSection) { - $this->setEnvironmentVariables($runConfiguration, $sections); + $this->queryCgiTest($sectionHeadings); + + $this->setEnvironmentVariables($runConfiguration, $sections, $fileSection); $this->setPhpCommandLineArguments($runConfiguration, $sections); $this->setTestCommandLineArguments($sections); $this->setPhpExecutable($runConfiguration, $sectionHeadings); + + if($this->isCgiTest) { + $this->environmentVariables['SCRIPT_FILENAME'] = $fileSection->getFileName(); + $this->environmentVariables['PATH_TRANSLATED'] = $fileSection->getFileName(); + //Required by when the cgi has been compiled with force-cgi-redirect. + $this->environmentVariables['REDIRECT_STATUS'] = '1'; + } } - private function setEnvironmentVariables(rtRuntestsConfiguration $runConfiguration, $sections) + private function setEnvironmentVariables(rtRuntestsConfiguration $runConfiguration, $sections, $fileSection) { $this->environmentVariables = $runConfiguration->getEnvironmentVariables(); if (array_key_exists('ENV', $sections)) { @@ -77,14 +87,21 @@ private function setPhpExecutable($runConfiguration, $sectionHeadings) { - $tempArray = array_diff($this->cgiSections, $sectionHeadings); - if (count($tempArray) < count($this->cgiSections)) { - $this->phpExecutable = $runConfiguration->getSetting('PhpCgiExecutable'); + if ($this->isCgiTest) { + $this->phpExecutable = $runConfiguration->getSetting('PhpCgiExecutable'). " -C"; } else { $this->phpExecutable = $runConfiguration->getSetting('PhpExecutable'); } } + private function queryCgiTest($sectionHeadings) + { + $tempArray = array_diff($this->cgiSections, $sectionHeadings); + if (count($tempArray) < count($this->cgiSections)) { + $this->isCgiTest = true; + } + } + public function getPhpExecutable() { return $this->phpExecutable; @@ -93,6 +110,7 @@ public function getEnvironmentVariables() { return $this->environmentVariables; + } public function getPhpCommandLineArguments()
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php