From: Pierre Joye <pajoye@php.net>
Date: Tue, 7 Jul 2009 21:56:18 +0000 (+0000)
Subject: - sync with 5.3
X-Git-Tag: php-5.4.0alpha1~191^2~3144
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72d203ea31a1b9699b75585c652dbb00024e68fe;p=php

- sync with 5.3
---

diff --git a/ext/standard/tests/file/touch_variation5-win32.phpt b/ext/standard/tests/file/touch_variation5-win32.phpt
index 062d5d7d79..079093b1cc 100644
--- a/ext/standard/tests/file/touch_variation5-win32.phpt
+++ b/ext/standard/tests/file/touch_variation5-win32.phpt
@@ -162,10 +162,10 @@ PASSED: ./touchVar5.tmp/aSubDirOrFile - created
 PASSED: touchVar5.tmp/../touchVar5.tmp/aSubDirOrFile - created
 --- testing touchVar5.tmp/../BADDIR/aSubDirOrFile ---
 
-Warning: touch(): Unable to create file touchVar5.tmp/../BADDIR/aSubDirOrFile because No such file or directory in %s on line %d
+Warning: touch(): Unable to create file touchVar5.tmp/../BADDIR/aSubDirOrFile because %s in %s on line %d
 --- testing BADDIR/aSubDirOrFile ---
 
-Warning: touch(): Unable to create file BADDIR/aSubDirOrFile because No such file or directory in %s on line %d
+Warning: touch(): Unable to create file BADDIR/aSubDirOrFile because %s in %s on line %d
 --- testing %s/touchVar5.tmp/aSubDirOrFile ---
 PASSED: %s/touchVar5.tmp/aSubDirOrFile - created
 --- testing %s/./touchVar5.tmp/aSubDirOrFile ---
@@ -174,7 +174,7 @@ PASSED: %s/./touchVar5.tmp/aSubDirOrFile - created
 PASSED: %s/touchVar5.tmp/../touchVar5.tmp/aSubDirOrFile - created
 --- testing %s/BADDIR/aSubDirOrFile ---
 
-Warning: touch(): Unable to create file %s/BADDIR/aSubDirOrFile because No such file or directory in %s on line %d
+Warning: touch(): Unable to create file %s/BADDIR/aSubDirOrFile because %s in %s on line %d
 --- testing touchVar5.tmp/aSubDirOrFile/ ---
 
 Warning: touch(): Unable to create file touchVar5.tmp/aSubDirOrFile/ because Invalid argument in %s on line %d
diff --git a/ext/standard/tests/file/touch_variation6-win32.phpt b/ext/standard/tests/file/touch_variation6-win32.phpt
index 3d0ee92326..57433869c2 100644
--- a/ext/standard/tests/file/touch_variation6-win32.phpt
+++ b/ext/standard/tests/file/touch_variation6-win32.phpt
@@ -168,10 +168,10 @@ PASSED: .\touchVar5.tmp\aSubDirOrFile - created
 PASSED: touchVar5.tmp\..\touchVar5.tmp\aSubDirOrFile - created
 --- testing touchVar5.tmp\..\BADDIR\aSubDirOrFile ---
 
-Warning: touch(): Unable to create file touchVar5.tmp\..\BADDIR\aSubDirOrFile because No such file or directory in %s on line %d
+Warning: touch(): Unable to create file touchVar5.tmp\..\BADDIR\aSubDirOrFile because %s in %s on line %d
 --- testing BADDIR\aSubDirOrFile ---
 
-Warning: touch(): Unable to create file BADDIR\aSubDirOrFile because No such file or directory in %s on line %d
+Warning: touch(): Unable to create file BADDIR\aSubDirOrFile because %s in %s on line %d
 --- testing %s\touchVar5.tmp\aSubDirOrFile ---
 PASSED: %s\touchVar5.tmp\aSubDirOrFile - created
 --- testing %s\.\touchVar5.tmp\aSubDirOrFile ---
@@ -180,7 +180,7 @@ PASSED: %s\.\touchVar5.tmp\aSubDirOrFile - created
 PASSED: %s\touchVar5.tmp\..\touchVar5.tmp\aSubDirOrFile - created
 --- testing %s\BADDIR\aSubDirOrFile ---
 
-Warning: touch(): Unable to create file %s\BADDIR\aSubDirOrFile because No such file or directory in %s on line %d
+Warning: touch(): Unable to create file %s\BADDIR\aSubDirOrFile because %s in %s on line %d
 --- testing touchVar5.tmp\aSubDirOrFile\ ---
 
 Warning: touch(): Unable to create file touchVar5.tmp\aSubDirOrFile\ because Invalid argument in %s on line %d
@@ -191,8 +191,8 @@ Warning: touch(): Unable to create file %s\touchVar5.tmp\aSubDirOrFile\ because
 PASSED: touchVar5.tmp\\aSubDirOrFile - created
 --- testing %s\\touchVar5.tmp\\aSubDirOrFile ---
 PASSED: %s\\touchVar5.tmp\\aSubDirOrFile - created
---- testing %s/touchVar5.tmp/aSubDirOrFile ---
-PASSED: %s/touchVar5.tmp/aSubDirOrFile - created
+--- testing /%s/touchVar5.tmp/aSubDirOrFile ---
+PASSED: /%s/touchVar5.tmp/aSubDirOrFile - created
 
 *** testing existing files ***
 --- testing touchVar5.tmp\aSubDirOrFile ---
@@ -211,8 +211,8 @@ PASSED: %s\touchVar5.tmp\..\touchVar5.tmp\aSubDirOrFile - touched
 PASSED: touchVar5.tmp\\aSubDirOrFile - touched
 --- testing %s\\touchVar5.tmp\\aSubDirOrFile ---
 PASSED: %s\\touchVar5.tmp\\aSubDirOrFile - touched
---- testing %s/touchVar5.tmp/aSubDirOrFile ---
-PASSED: %s/touchVar5.tmp/aSubDirOrFile - touched
+--- testing /%s/touchVar5.tmp/aSubDirOrFile ---
+PASSED: /%s/touchVar5.tmp/aSubDirOrFile - touched
 
 *** testing existing directories ***
 --- testing touchVar5.tmp\aSubDirOrFile ---
@@ -235,7 +235,7 @@ PASSED: %s\touchVar5.tmp\aSubDirOrFile\ - touched
 PASSED: touchVar5.tmp\\aSubDirOrFile - touched
 --- testing %s\\touchVar5.tmp\\aSubDirOrFile ---
 PASSED: %s\\touchVar5.tmp\\aSubDirOrFile - touched
---- testing %s/touchVar5.tmp/aSubDirOrFile ---
-PASSED: %s/touchVar5.tmp/aSubDirOrFile - touched
+--- testing /%s/touchVar5.tmp/aSubDirOrFile ---
+PASSED: /%s/touchVar5.tmp/aSubDirOrFile - touched
 ===DONE===