zoe Sun Apr 26 06:54:12 2009 UTC
Modified files:
/phpruntests/src/configuration/settings rtPhpExecutableSetting.php
rtPhpCgiExecutableSetting.php
rtCurrentDirectorySetting.php
Log:
Changes to the wy that the CGI executable is set
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/settings/rtPhpExecutableSetting.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/configuration/settings/rtPhpExecutableSetting.php
diff -u phpruntests/src/configuration/settings/rtPhpExecutableSetting.php:1.3
phpruntests/src/configuration/settings/rtPhpExecutableSetting.php:1.4
--- phpruntests/src/configuration/settings/rtPhpExecutableSetting.php:1.3
Fri Apr 24 08:41:25 2009
+++ phpruntests/src/configuration/settings/rtPhpExecutableSetting.php Sun Apr
26 06:54:12 2009
@@ -9,23 +9,18 @@
const SAPI_CLI = "/sapi/cli/php";
private $phpExecutable;
-
+
/**
* Sets the PHP executable, note the dependency on working directory
*
*/
public function init(rtRuntestsConfiguration $configuration)
{
- if (is_null($configuration->getSetting('workingDirectory'))) {
- $workingDir = 'WORKING_DIR';
- } else {
- $workingDir = $configuration->getSetting('workingDirectory');
- }
-
+
if ($configuration->hasEnvironmentVariable('TEST_PHP_EXECUTABLE')) {
- if ($configuration->getEnvironmentVariable('TEST_PHP_EXECUTABLE')
== 'auto') {
- $this->phpExecutable = $workingDir.self::SAPI_CLI;
+ if ($configuration->getEnvironmentVariable('TEST_PHP_EXECUTABLE')
== 'auto') {
+ $this->phpExecutable =
$configuration->getSetting('WorkingDirectory').self::SAPI_CLI;
} else {
$this->phpExecutable =
$configuration->getEnvironmentVariable('TEST_PHP_EXECUTABLE');
}
@@ -43,7 +38,7 @@
public function get()
{
return $this->phpExecutable;
- }
+ }
}
?>
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php?r1=1.4&r2=1.5&diff_format=u
Index: phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php
diff -u
phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php:1.4
phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php:1.5
--- phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php:1.4
Sat Apr 25 17:18:23 2009
+++ phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php
Sun Apr 26 06:54:12 2009
@@ -16,15 +16,11 @@
*/
public function init(rtRuntestsConfiguration $configuration)
{
- if (is_null($configuration->getSetting('workingDirectory'))) {
- $workingDir = 'WORKING_DIR';
- } else {
- $workingDir = $configuration->getSetting('workingDirectory');
- }
+
if ($configuration->hasEnvironmentVariable('TEST_PHP_CGI_EXECUTABLE'))
{
if
($configuration->getEnvironmentVariable('TEST_PHP_CGI_EXECUTABLE') == 'auto') {
- $this->phpCgiExecutable = $workingDir . self::SAPI_CGI;
+ $this->phpCgiExecutable =
$configuration->getSetting('WorkingDirectory') . self::SAPI_CGI;
} else {
$this->phpCgiExecutable =
$configuration->getEnvironmentVariable('TEST_PHP_CGI_EXECUTABLE');
}
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/settings/rtCurrentDirectorySetting.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/configuration/settings/rtCurrentDirectorySetting.php
diff -u
phpruntests/src/configuration/settings/rtCurrentDirectorySetting.php:1.2
phpruntests/src/configuration/settings/rtCurrentDirectorySetting.php:1.3
--- phpruntests/src/configuration/settings/rtCurrentDirectorySetting.php:1.2
Mon Apr 20 20:24:30 2009
+++ phpruntests/src/configuration/settings/rtCurrentDirectorySetting.php
Sun Apr 26 06:54:12 2009
@@ -14,7 +14,7 @@
*/
public function init(rtRuntestsConfiguration $configuration)
{
- $this->currentDirectory = getcwd();
+ $this->currentDirectory = realpath(getcwd());
}
/**
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
