helly Sat Nov 26 11:33:08 2005 EDT
Modified files:
/php-src run-tests.php
Log:
- Bug 35382 was nit fixed but the test system was not capable for this kind
of tests
http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.237&r2=1.238&ty=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.237 php-src/run-tests.php:1.238
--- php-src/run-tests.php:1.237 Thu Oct 6 15:51:03 2005
+++ php-src/run-tests.php Sat Nov 26 11:33:08 2005
@@ -23,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.237 2005/10/06 19:51:03 helly Exp $ */
+/* $Id: run-tests.php,v 1.238 2005/11/26 16:33:08 helly Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -785,10 +785,14 @@
$borked = false;
}
} else {
- if (@count($section_text['FILE']) != 1) {
+ if (@count($section_text['FILE']) +
@count($section_text['FILEEOF']) != 1) {
$bork_info = "missing section --FILE-- [$file]";
$borked = true;
}
+ if (@count($section_text['FILEEOF']) == 1) {
+ $section_text['FILE'] = preg_replace('/[\r\n]+$/', '',
$section_text['FILEEOF']);
+ unset($section_text['FILEEOF']);
+ }
if ((@count($section_text['EXPECT']) +
@count($section_text['EXPECTF']) + @count($section_text['EXPECTREGEX'])) != 1) {
$bork_info = "missing section --EXPECT--, --EXPECTF--
or --EXPECTREGEX-- [$file]";
$borked = true;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
