com phpruntests: Fixing to use teh CGI executable for SKIPIFs in CGI tests: src/testcase/sections/executablesections/rtSkipIfSection.php

Commit: 62543625fb339af13de870c967a4ab0af8933cfa Author: Zoe Slattery <zoe@php.net> Sat, 18 Jul 2009 13:11:32 +0000 Parents: f022a1e61c9c27ab7f3f9bab6441faf9313000dd Branches: master Link: http://git.php.net/?p=phpruntests.git;a=commitdiff;h=62543625fb339af13de870c967a4ab0af8933cfa Log: Fixing to use teh CGI executable for SKIPIFs in CGI tests Changed paths: M src/testcase/sections/executablesections/rtSkipIfSection.php Diff: diff --git a/src/testcase/sections/executablesections/rtSkipIfSection.php b/src/testcase/sections/executablesections/rtSkipIfSection.php index 44276e1..76e59ea 100644 --- a/src/testcase/sections/executablesections/rtSkipIfSection.php +++ b/src/testcase/sections/executablesections/rtSkipIfSection.php @@ -25,9 +25,18 @@ class rtSkipIfSection extends rtExecutableSection $testStatus = $testCase->getStatus(); $this->setExecutableFileName($testCase->getName()); $this->writeExecutableFile(); + + $phpExecutable = $testCase->testConfiguration->getPhpExecutable(); + + // 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 = $runConfiguration->getSetting('PhpExecutable'); - $phpCommand .= ' '.$runConfiguration->getSetting('PhpCommandLineArguments'); + $phpCommand = $phpExecutable; + $phpCommand .= ' '.$testCase->testConfiguration->getPhpCommandLineArguments(); $phpCommand .= ' -f '.$this->fileName; $PhpRunner = new rtPhpRunner($phpCommand,