]> granicus.if.org Git - php/commitdiff
- Bug 35382 was nit fixed but the test system was not capable for this kind
authorMarcus Boerger <helly@php.net>
Sat, 26 Nov 2005 16:33:08 +0000 (16:33 +0000)
committerMarcus Boerger <helly@php.net>
Sat, 26 Nov 2005 16:33:08 +0000 (16:33 +0000)
  of tests

run-tests.php

index ced4296c03ccc7e6bf8d26b5f4e0182f63436be5..4f9573aff745511f3223e598b581af0a25f81a37 100755 (executable)
@@ -785,10 +785,14 @@ TEST $file
                        $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;