zoe Sat, 18 Jul 2009 13:11:32 +0000
URL: http://svn.php.net/viewvc?view=revision&revision=284313
Changed paths:
U
php/phpruntests/trunk/src/testcase/sections/executablesections/rtSkipIfSection.php
Log:
Fixing to use teh CGI executable for SKIPIFs in CGI tests
Modified:
php/phpruntests/trunk/src/testcase/sections/executablesections/rtSkipIfSection.php
===================================================================
---
php/phpruntests/trunk/src/testcase/sections/executablesections/rtSkipIfSection.php
2009-07-18 12:27:46 UTC (rev 284312)
+++
php/phpruntests/trunk/src/testcase/sections/executablesections/rtSkipIfSection.php
2009-07-18 13:11:32 UTC (rev 284313)
@@ -25,9 +25,18 @@
$testStatus = $testCase->getStatus();
$this->setExecutableFileName($testCase->getName());
$this->writeExecutableFile();
+
+ $phpExecutable = $testCase->testConfiguration->getPhpExecutable();
- $phpCommand = $runConfiguration->getSetting('PhpExecutable');
- $phpCommand .= '
'.$runConfiguration->getSetting('PhpCommandLineArguments');
+ // The CGI excutable is null if it is not available, check and SKIP if
necessary
+ if (is_null($phpExecutable)) {
+ $testStatus->setTrue('skip');
+ $testStatus->setMessage('skip', 'The CGI executable is
unavailable' );
+ return $testStatus;
+ }
+
+ $phpCommand = $phpExecutable;
+ $phpCommand .= '
'.$testCase->testConfiguration->getPhpCommandLineArguments();
$phpCommand .= ' -f '.$this->fileName;
$PhpRunner = new rtPhpRunner($phpCommand,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
