zoe Wed May 13 01:48:53 2009 UTC
Modified files:
/phpruntests/tests/testcase rtTestConfigurationTest.php
Log:
fixing test
http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/rtTestConfigurationTest.php?r1=1.5&r2=1.6&diff_format=u
Index: phpruntests/tests/testcase/rtTestConfigurationTest.php
diff -u phpruntests/tests/testcase/rtTestConfigurationTest.php:1.5
phpruntests/tests/testcase/rtTestConfigurationTest.php:1.6
--- phpruntests/tests/testcase/rtTestConfigurationTest.php:1.5 Sun Apr 26
22:45:10 2009
+++ phpruntests/tests/testcase/rtTestConfigurationTest.php Wed May 13
01:48:53 2009
@@ -9,6 +9,8 @@
public function setUp()
{
+ $this->php = $this->php = trim(shell_exec("which php"));
+
$this->sections['ARGS'] = new rtArgsSection('ARGS', array('-vvv -a
value -1111 -2 -v'));
$this->sections['ENV'] = new rtEnvSection('ENV', array('env1 = ENV1',
'env2=ENV2'));
$this->sections['INI'] = new rtIniSection('INI',
array('error_reporting=E_ALL | E_STRICT | E_DEPRECATED', 'assert.active = 1'));
@@ -18,7 +20,7 @@
public function testCreateInstance()
{
- $config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', 'a-php-exe', 'test.phpt'));
+ $config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', $this->php, 'test.phpt'));
$config->configure();
$testConfiguration = new rtTestConfiguration($config, $this->sections,
array(),$this->sections['FILE']);
@@ -28,7 +30,7 @@
public function testEnv()
{
- $config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', 'a-php-exe', 'test.phpt'));
+ $config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', $this->php, 'test.phpt'));
$config->configure();
$testConfiguration = new rtTestConfiguration($config, $this->sections,
array(), $this->sections['FILE']);
@@ -40,7 +42,7 @@
public function testArgs()
{
- $config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', 'a-php-exe', 'test.phpt'));
+ $config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', $this->php, 'test.phpt'));
$config->configure();
$testConfiguration = new rtTestConfiguration($config, $this->sections,
array(),$this->sections['FILE']);
@@ -52,7 +54,7 @@
public function testIni()
{
- $config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', 'a-php-exe', 'test.phpt'));
+ $config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', $this->php, 'test.phpt'));
$config->configure();
$testConfiguration = new rtTestConfiguration($config, $this->sections,
array(),$this->sections['FILE']);
@@ -64,18 +66,18 @@
public function testPHPExecutable()
{
- $config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', 'a-php-exe', 'test.phpt'));
+ $config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', $this->php, 'test.phpt'));
$config->configure();
$testConfiguration = new rtTestConfiguration($config, $this->sections,
array(),$this->sections['FILE']);
$phpExe = $testConfiguration->getPhpExecutable();
- $this->assertEquals('a-php-exe', $phpExe);
+ $this->assertEquals('/usr/local/bin/php', $phpExe);
}
public function testPHPCgiExecutable()
{
- $config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', 'a-php-exe', 'test.phpt'));
+ $config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', $this->php, 'test.phpt'));
$config->setEnvironmentVariable('TEST_PHP_CGI_EXECUTABLE',
'a-php-cgi-exe');
$config->configure();
Advertising
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
