com phpruntests: added os-check and env-var 'SystemRoot' for windows: src/configuration/rtEnvironmentVariables.php
src/configuration/rtRuntestsConfiguration.php src/configuration/unix/rtUnixConfiguration.php src/configuration/unix/rtUnixEnvironmentVariables.php
src/configuration/windows/rtWinConfiguration.php src/configuration/windows/rtWinEnvironmentVariables.php src/testrun/rtPhpTestRun.php
tests/configuration/rtEnvironmentVariablesTest.php

Commit: 67f42619fd5afb73c4c9db718e37733fcc795d89 Author: Georg Gradwohl <g2@php.net> Fri, 28 Aug 2009 22:31:24 +0000 Parents: fb22a57a596ccb70fd9ebe128b45f232f5786ecd Branches: master Link: http://git.php.net/?p=phpruntests.git;a=commitdiff;h=67f42619fd5afb73c4c9db718e37733fcc795d89 Log: added os-check and env-var 'SystemRoot' for windows Changed paths: M src/configuration/rtEnvironmentVariables.php M src/configuration/rtRuntestsConfiguration.php M src/configuration/unix/rtUnixConfiguration.php M src/configuration/unix/rtUnixEnvironmentVariables.php M src/configuration/windows/rtWinConfiguration.php M src/configuration/windows/rtWinEnvironmentVariables.php M src/testrun/rtPhpTestRun.php M tests/configuration/rtEnvironmentVariablesTest.php Diff: diff --git a/src/configuration/rtEnvironmentVariables.php b/src/configuration/rtEnvironmentVariables.php index 8069211..8d6cc38 100644 --- a/src/configuration/rtEnvironmentVariables.php +++ b/src/configuration/rtEnvironmentVariables.php @@ -33,10 +33,10 @@ class rtEnvironmentVariables protected $environmentVariables = array(); - public function __construct() - { - } + + protected function __construct() {} + static public function getInstance ($os = 'Unix') { if ($os == 'Windows') { @@ -57,7 +57,6 @@ class rtEnvironmentVariables $this->environmentVariables[$variable] = getenv($variable); } } - } public function setVariable($var,$value) diff --git a/src/configuration/rtRuntestsConfiguration.php b/src/configuration/rtRuntestsConfiguration.php index 7d531bd..744e9da 100644 --- a/src/configuration/rtRuntestsConfiguration.php +++ b/src/configuration/rtRuntestsConfiguration.php @@ -22,6 +22,7 @@ abstract class rtRuntestsConfiguration protected $settings; protected $environmentVariables; protected $commandLine; + protected $operatingSystem; protected $memoryTool = null; @@ -58,7 +59,7 @@ abstract class rtRuntestsConfiguration $this->commandLine->parse($this->commandLineArgs); //create object to hold environment variables - $this->environmentVariables = rtEnvironmentVariables::getInstance(); + $this->environmentVariables = rtEnvironmentVariables::getInstance($this->operatingSystem); } /** diff --git a/src/configuration/unix/rtUnixConfiguration.php b/src/configuration/unix/rtUnixConfiguration.php index 22ca21f..c79b60b 100644 --- a/src/configuration/unix/rtUnixConfiguration.php +++ b/src/configuration/unix/rtUnixConfiguration.php @@ -17,7 +17,8 @@ class rtUnixConfiguration extends rtRuntestsConfiguration { public function __construct($cmdlineArgs) { - $this->commandLineArgs = $cmdlineArgs; + $this->operatingSystem = 'Unix'; + $this->commandLineArgs = $cmdlineArgs; $this->init(); } diff --git a/src/configuration/unix/rtUnixEnvironmentVariables.php b/src/configuration/unix/rtUnixEnvironmentVariables.php index 7c1ba46..620407f 100644 --- a/src/configuration/unix/rtUnixEnvironmentVariables.php +++ b/src/configuration/unix/rtUnixEnvironmentVariables.php @@ -19,7 +19,7 @@ class rtUnixEnvironmentVariables extends rtEnvironmentVariables * Adapts the environment to Unix * */ - public function adaptEnvironment() + public function __construct() { array_push($this->userSuppliedVariables, 'TEST_PHP_PARALLEL'); } diff --git a/src/configuration/windows/rtWinConfiguration.php b/src/configuration/windows/rtWinConfiguration.php index 7d5761f..965b591 100644 --- a/src/configuration/windows/rtWinConfiguration.php +++ b/src/configuration/windows/rtWinConfiguration.php @@ -17,7 +17,8 @@ class rtWinConfiguration extends rtRuntestsConfiguration { public function __construct($cmdlineArgs) { - $this->commandLineArgs = $cmdlineArgs; + $this->operatingSystem = 'Windows'; + $this->commandLineArgs = $cmdlineArgs; $this->init(); } diff --git a/src/configuration/windows/rtWinEnvironmentVariables.php b/src/configuration/windows/rtWinEnvironmentVariables.php index a1667d3..e92ee76 100644 --- a/src/configuration/windows/rtWinEnvironmentVariables.php +++ b/src/configuration/windows/rtWinEnvironmentVariables.php @@ -19,9 +19,9 @@ class rtWinEnvironmentVariables extends rtEnvironmentVariables * Adapts the environment variables for Windows * */ - public function adaptEnvironment() + public function __construct() { - array_push($this->userSuppliedVariables, 'SystemRoot'); + array_push($this->userSuppliedVariables, 'SystemRoot'); } } ?> diff --git a/src/testrun/rtPhpTestRun.php b/src/testrun/rtPhpTestRun.php index ca2616e..d9fbaca 100644 --- a/src/testrun/rtPhpTestRun.php +++ b/src/testrun/rtPhpTestRun.php @@ -26,11 +26,14 @@ class rtPhpTestRun { //Set SSH variables + // check the operation-system (win/unix) + $os = (substr(PHP_OS, 0, 3) == "WIN") ? 'Windows' : 'Unix'; + //Configure the test environment - $runConfiguration = rtRuntestsConfiguration::getInstance($this->commandLineArguments); + $runConfiguration = rtRuntestsConfiguration::getInstance($this->commandLineArguments, $os); $runConfiguration->getUserEnvironment(); $runConfiguration->configure(); - + //Check help message if($runConfiguration->hasCommandLineOption('help') || $runConfiguration->hasCommandLineOption('h')) { @@ -39,7 +42,7 @@ class rtPhpTestRun } //Check the preconditions - $preConditionList = rtPreConditionList::getInstance(); + $preConditionList = rtPreConditionList::getInstance($os); // $preConditionList->check($this->commandLine, $this->environmentVariables); $preConditionList->check($runConfiguration); diff --git a/tests/configuration/rtEnvironmentVariablesTest.php b/tests/configuration/rtEnvironmentVariablesTest.php index a51461b..2158cf4 100644 --- a/tests/configuration/rtEnvironmentVariablesTest.php +++ b/tests/configuration/rtEnvironmentVariablesTest.php @@ -37,7 +37,6 @@ class rtEnvironmentVariablesTest extends PHPUnit_Framework_TestCase { putenv('TEST_PHP_PARALLEL=a-parallel-run'); $ev = rtEnvironmentVariables::getInstance(); - $ev->adaptEnvironment(); $ev->getUserSuppliedVariables(); $this->assertEquals('a-parallel-run', $ev->getVariable('TEST_PHP_PARALLEL')); @@ -47,7 +46,6 @@ class rtEnvironmentVariablesTest extends PHPUnit_Framework_TestCase { putenv('SystemRoot=some-windows-thing'); $ev = rtEnvironmentVariables::getInstance('Windows'); - $ev->adaptEnvironment(); $ev->getUserSuppliedVariables(); $this->assertEquals('some-windows-thing', $ev->getVariable('SystemRoot'));