svn: php/phpruntests/trunk/tests/testcase/
| From: | Zoe Slattery | Date: | Wed, 15 Jul 2009 15:24:01 +0000 |
| Subject: | svn: php/phpruntests/trunk/tests/testcase/ | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-59468@lists.php.net to get a copy of this message | ||
zoe Wed, 15 Jul 2009 15:24:01 +0000
URL: http://svn.php.net/viewvc?view=revision&revision=284128
Changed paths:
U php/phpruntests/trunk/tests/testcase/rtGetExecutionTest.php
Log:
fixing for Georg
Modified: php/phpruntests/trunk/tests/testcase/rtGetExecutionTest.php
===================================================================
--- php/phpruntests/trunk/tests/testcase/rtGetExecutionTest.php 2009-07-15 15:19:52 UTC (rev 284127)
+++ php/phpruntests/trunk/tests/testcase/rtGetExecutionTest.php 2009-07-15 15:24:01 UTC (rev 284128)
@@ -49,7 +49,7 @@
$status = $testCase->getStatus();
$this->assertEquals('85', strlen($output));
- $this->assertFalse($testCase->getStatus()->getValue('fail'));
+ $this->assertFalse($testCase->getStatus()->getValue('fail'));
}
@@ -78,15 +78,22 @@
$testCase->executeTest($config);
$output = $testCase->getOutput();
//var_dump($output);
-
+
$status = $testCase->getStatus();
-
- $this->assertEquals(0, strlen($output));
- $this->assertTrue($testCase->getStatus()->getValue('skip'));
- $this->assertEquals('The CGI executable is unavailable',
$testCase->getStatus()->getMessage('skip'));
+
+ $setPhp = $configuration->getSetting('TEST_PHP_EXECUTABLE');
+ if (preg_match("/sapi/", $setPhp)) {
+ // Make no assertion bacuse the CGI executable can be guesed
+ } else {
+ $this->assertEquals(0, strlen($output));
+ $this->assertTrue($testCase->getStatus()->getValue('skip'));
+ $this->assertEquals('The CGI executable is unavailable',
$testCase->getStatus()->getMessage('skip'));
+ }
+
+
}
}
?>