From: Pierre Joye Date: Thu, 28 Jan 2010 00:37:20 +0000 (+0000) Subject: - more EOL fixes, don't use expectf X-Git-Tag: php-5.4.0alpha1~191^2~2019 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=482f4376f3878eef1f2b783f28a516921083a212;p=php - more EOL fixes, don't use expectf --- diff --git a/ext/standard/tests/file/fgetss_basic1.phpt b/ext/standard/tests/file/fgetss_basic1.phpt index c220622594..7ea0ed01a8 100644 --- a/ext/standard/tests/file/fgetss_basic1.phpt +++ b/ext/standard/tests/file/fgetss_basic1.phpt @@ -22,7 +22,9 @@ is a heredoc string. ksklnm@@$$&$&^%&^%&^%& html EOT; - +if(substr(PHP_OS, 0, 3) == "WIN") { + $string_with_tags = str_replace("\r",'', $string_with_tags); +} /* try reading the file opened in different modes of reading */ $file_modes = array("r","rb", "rt","r+", "r+b", "r+t"); diff --git a/ext/standard/tests/file/fgetss_variation1-win32.phpt b/ext/standard/tests/file/fgetss_variation1-win32.phpt index bc5c6c28c2..29973dbff9 100644 --- a/ext/standard/tests/file/fgetss_variation1-win32.phpt +++ b/ext/standard/tests/file/fgetss_variation1-win32.phpt @@ -36,6 +36,10 @@ this text contains some html tags body
br
this is the line with \n character. EOT; +if(substr(PHP_OS, 0, 3) == "WIN") { + $string_with_tags = str_replace("\r",'', $string_with_tags); +} + $filename = dirname(__FILE__)."/fgetss_variation1.tmp"; /* try reading the file opened in different modes of reading */ diff --git a/ext/standard/tests/file/fgetss_variation3-win32.phpt b/ext/standard/tests/file/fgetss_variation3-win32.phpt index b6ade02c86..189c4cc208 100644 --- a/ext/standard/tests/file/fgetss_variation3-win32.phpt +++ b/ext/standard/tests/file/fgetss_variation3-win32.phpt @@ -35,6 +35,10 @@ this text contains some html tags body
br
this is the line with \n character. EOT; +if(substr(PHP_OS, 0, 3) == "WIN") { + $string_with_tags = str_replace("\r",'', $string_with_tags); +} + $filename = dirname(__FILE__)."/fgetss_variation3.tmp"; /* try reading the file opened in different modes of reading */ diff --git a/ext/standard/tests/file/fgetss_variation4.phpt b/ext/standard/tests/file/fgetss_variation4.phpt index 595041465e..f05e8840ac 100644 --- a/ext/standard/tests/file/fgetss_variation4.phpt +++ b/ext/standard/tests/file/fgetss_variation4.phpt @@ -1,5 +1,10 @@ --TEST-- -Test fgetss() function : usage variations - read modes, file pointer at EOF(bug#42126) +Test fgetss() function : usage variations - read modes, file pointer at EOF +--SKIPIF-- + --FILE-- body
br
this is the line with \n character. EOT; +if(substr(PHP_OS, 0, 3) == "WIN") { + $string_with_tags = str_replace("\r",'', $string_with_tags); +} $filename = dirname(__FILE__)."/fgetss_variation5.tmp";