From: Pierre Joye <pajoye@php.net>
Date: Fri, 15 Aug 2008 19:33:43 +0000 (+0000)
Subject: - make it portable without loosing pertinent data
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~696
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44ddda0c2db403e730c1f59139c174e097bc5d73;p=php

- make it portable without loosing pertinent data
---

diff --git a/ext/standard/tests/file/bug38086.phpt b/ext/standard/tests/file/bug38086.phpt
index 1e554a229b..d92289ef6e 100644
--- a/ext/standard/tests/file/bug38086.phpt
+++ b/ext/standard/tests/file/bug38086.phpt
@@ -2,6 +2,7 @@
 Bug #38086 (stream_copy_to_stream() returns 0 when maxlen is bigger than the actual length)
 --FILE--
 <?php
+define('WIN', substr(PHP_OS, 0, 3) == 'WIN');
 
 $initial_file = dirname(__FILE__).'/bug38086.txt';
 $new_file = dirname(__FILE__).'/bug38086_1.txt';
@@ -13,7 +14,11 @@ $dest = fopen($new_file, 'w');
 var_dump(stream_copy_to_stream($src, $dest));
 fclose($src); fclose($dest);
 
-var_dump(file_get_contents($new_file));
+if (WIN) {
+  var_dump(str_replace("\r\n","\n", file_get_contents($new_file)));
+} else {
+  var_dump(file_get_contents($new_file));
+}
 unlink($new_file);
 
 $src = fopen($initial_file, 'r');
@@ -23,20 +28,24 @@ $dest = fopen($new_file, 'w');
 var_dump(stream_copy_to_stream($src, $dest, 10000));
 fclose($src); fclose($dest);
 
-var_dump(file_get_contents($new_file));
+if (WIN) {
+  var_dump(str_replace("\r\n","\n", file_get_contents($new_file)));
+} else {
+  var_dump(file_get_contents($new_file));
+}
 unlink($new_file);
 
 echo "Done\n";
 ?>
---EXPECT--
-int(134)
+--EXPECTF--	
+int(%d)
 string(134) "Nabgure qnl
 Jura gur cnvaf bs yvsr jba'g one zl jnl
 V'yy oernx gurfr punvaf
 Gung ubyq zr qbja
 V'yy grne lbh qbja vagb zl cevingr uryy
 "
-int(134)
+int(%d)
 string(134) "Nabgure qnl
 Jura gur cnvaf bs yvsr jba'g one zl jnl
 V'yy oernx gurfr punvaf