From: Marcus Boerger <helly@php.net>
Date: Sat, 26 Nov 2005 16:33:08 +0000 (+0000)
Subject: - Bug 35382 was nit fixed but the test system was not capable for this kind
X-Git-Tag: RELEASE_2_0_2~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e4bcd3a5d7c301dc725a621422e7e26ab757850;p=php

- Bug 35382 was nit fixed but the test system was not capable for this kind
  of tests
---

diff --git a/run-tests.php b/run-tests.php
index ced4296c03..4f9573aff7 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -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;