zoe Wed, 15 Jul 2009 12:02:47 +0000
URL: http://svn.php.net/viewvc?view=revision&revision=284116
Changed paths:
U
php/phpruntests/trunk/tests/configuration/settings/rtPhpCgiExecutableSettingTest.php
Log:
possible fix to cgi test
Modified:
php/phpruntests/trunk/tests/configuration/settings/rtPhpCgiExecutableSettingTest.php
===================================================================
---
php/phpruntests/trunk/tests/configuration/settings/rtPhpCgiExecutableSettingTest.php
2009-07-15 11:30:42 UTC (rev 284115)
+++
php/phpruntests/trunk/tests/configuration/settings/rtPhpCgiExecutableSettingTest.php
2009-07-15 12:02:47 UTC (rev 284116)
@@ -25,8 +25,14 @@
$configuration =
rtRuntestsConfiguration::getInstance(array('run-tests.php', 'test.phpt'));
$configuration->setEnvironmentVariable('TEST_PHP_CGI_EXECUTABLE', '');
$setting = new rtPhpCgiExecutableSetting($configuration);
-
- $this->assertEquals(null, $setting->get());
+
+ $setPhp = $configuration->getSetting('TEST_PHP_EXECUTABLE');
+
+ if (preg_match("/sapi/", $setPhp)) {
+ // Make no assertion bacuse the CGI executable can be guesed
+ } else {
+ $this->assertEquals(null, $setting->get());
+ }
}
public function testSetFromCliExecutableName() {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
