- system/version dependent msg

diff --git a/ext/standard/tests/file/rename_variation12.phpt b/ext/standard/tests/file/rename_variation12.phpt
index 3fc3903b8920e3a78efffec7796bcc234d878ce7..2c23609e42c2d6b3de9a18074252597997464553 100644 (file)
--- a/ext/standard/tests/file/rename_variation12.phpt
+++ b/ext/standard/tests/file/rename_variation12.phpt
@@ -118,4 +118,4 @@ bool(true)
 Warning: rename(BADDIR/renameMe.tmp,BADDIR/IwasRenamed.tmp): The system cannot find the path specified. (code: 3) in %s on line %d
 bool(false)
 
-*** Done ***
\ No newline at end of file
+*** Done ***

diff --git a/ext/standard/tests/file/rename_variation13.phpt b/ext/standard/tests/file/rename_variation13.phpt
index 72ad02d1498094a087681218181cf090e73b1348..b9cfeef5fdd0bba3dc77782dfcbb46addf20077a 100644 (file)
--- a/ext/standard/tests/file/rename_variation13.phpt
+++ b/ext/standard/tests/file/rename_variation13.phpt
@@ -73,24 +73,24 @@ Warning: rename(1,%s/renameVar13/afile.tmp): No such file or directory in %s on
 bool(false)
 -- testing '' --
 
-Warning: rename(%s/renameVar13/afile.tmp,): No such file or directory in %s on line %d
+Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
 bool(false)
 
-Warning: rename(,%s/renameVar13/afile.tmp): No such file or directory in %s on line %d
+Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d
 bool(false)
 -- testing '' --
 
-Warning: rename(%s/renameVar13/afile.tmp,): No such file or directory in %s on line %d
+Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
 bool(false)
 
-Warning: rename(,%s/renameVar13/afile.tmp): No such file or directory in %s on line %d
+Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d
 bool(false)
 -- testing '' --
 
-Warning: rename(%s/renameVar13/afile.tmp,): No such file or directory in %s on line %d
+Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
 bool(false)
 
-Warning: rename(,%s/renameVar13/afile.tmp): No such file or directory in %s on line %d
+Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d
 bool(false)
 -- testing ' ' --
 bool(true)
@@ -123,10 +123,10 @@ Warning: rename(/no/such/file/dir,%s/renameVar13/afile.tmp): No such file or dir
 bool(false)
 -- testing 'php/php' --
 
-Warning: rename(%s/renameVar13/afile.tmp,php/php): No such file or directory in %s on line %d
+Warning: rename(%s/renameVar13/afile.tmp,php/php): %s in %s on line %d
 bool(false)
 
-Warning: rename(php/php,%s/renameVar13/afile.tmp): No such file or directory in %s on line %d
+Warning: rename(php/php,%s/renameVar13/afile.tmp): %s in %s on line %d
 bool(false)
 
 *** Done ***

diff --git a/ext/standard/tests/file/tempnam_variation3.phpt b/ext/standard/tests/file/tempnam_variation3.phpt
index c3895b9e1d9ed843b83cc15d62ca11cdfa9691bb..4db795e33e2a6803c8d7b4e5f9ac053fb371dca2 100644 (file)
--- a/ext/standard/tests/file/tempnam_variation3.phpt
+++ b/ext/standard/tests/file/tempnam_variation3.phpt
@@ -106,9 +106,9 @@ File created in => directory specified
 -- Iteration 7 --
 
 Notice: Array to string conversion in %sp on line %d
-File name is => %s/%s
-File permissions are => 100600
-File created in => directory specified
+-- File is not created --
+
+Warning: unlink(): %s in %s on line %d
 -- Iteration 8 --
 File name is => %s/dir%s
 File permissions are => 100600

diff --git a/ext/standard/tests/file/tempnam_variation7.phpt b/ext/standard/tests/file/tempnam_variation7.phpt
index 4aa65380196017fe9baa58684f02066a8270311d..198253aeb52fecf167bed1d068591253d51e9c0d 100644 (file)
--- a/ext/standard/tests/file/tempnam_variation7.phpt
+++ b/ext/standard/tests/file/tempnam_variation7.phpt
@@ -100,9 +100,9 @@ File created in => temp dir
 -- Iteration 7 --
 
 Notice: Array to string conversion in %s on line %d
-File name is => %s%etempnam_variation3.tmp%s
-File permissions are => 100600
-File created in => temp dir
+-- File is not created --
+
+Warning: unlink(): %s in %s on line %d
 -- Iteration 8 --
 File name is => %s%etempnam_variation3.tmp%s
 File permissions are => 100600