Skip to content

Commit 14639c4

Browse files
committed
Try to finally fix test messages on Windows
1 parent 927b8e5 commit 14639c4

6 files changed

+9
-9
lines changed

ext/standard/tests/file/file_get_contents_variation8-win32.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ bool(false)
7373

7474
-- Filename: " " --
7575

76-
Warning: file_get_contents( ): failed to open stream: Permission denied in %s on line %d
76+
Warning: file_get_contents(): failed to open stream ( ): Permission denied in %s on line %d
7777
bool(false)
7878

7979
-- Filename: \0 --

ext/standard/tests/file/file_put_contents_variation8-win32.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Failed to write data to: ""
7373

7474
-- Filename: " " --
7575

76-
Warning: file_put_contents( ): failed to open stream: Permission denied in %s on line %d
76+
Warning: file_put_contents(): failed to open stream ( ): Permission denied in %s on line %d
7777
Failed to write data to: " "
7878

7979
-- Filename: \0 --

ext/standard/tests/file/mkdir_rmdir_variation-win32-mb.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1599,7 +1599,7 @@ bool(true)
15991599
*** Testing rmdir() on a non-empty directory ***
16001600
bool(true)
16011601

1602-
Warning: rmdir(): Directory not empty (%s/mkdir私はガラスを食べられます/) in %s on line %d
1602+
Warning: rmdir(): Directory not empty with URI (%s/mkdir私はガラスを食べられます/) in %s on line %d
16031603
bool(false)
16041604

16051605
*** Testing mkdir() and rmdir() for binary safe functionality ***

ext/standard/tests/file/mkdir_rmdir_variation-win32.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1599,7 +1599,7 @@ bool(true)
15991599
*** Testing rmdir() on a non-empty directory ***
16001600
bool(true)
16011601

1602-
Warning: rmdir(): Directory not empty (%s/mkdir/) in %s on line %d
1602+
Warning: rmdir(): Directory not empty with URI (%s/mkdir/) in %s on line %d
16031603
bool(false)
16041604

16051605
*** Testing mkdir() and rmdir() for binary safe functionality ***

ext/standard/tests/file/rmdir_variation3-win32.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ Directory removed
8282
Directory removed
8383
-- removing rmdirVar3.tmp\..\BADDIR\aSubDir --
8484

85-
Warning: rmdir(): No such file or directory (rmdirVar3.tmp\..\BADDIR\aSubDir) in %s on line %d
85+
Warning: rmdir(): No such file or directory with URI (rmdirVar3.tmp\..\BADDIR\aSubDir) in %s on line %d
8686
-- removing BADDIR\aSubDir --
8787

88-
Warning: rmdir(): No such file or directory (BADDIR\aSubDir) in %s on line %d
88+
Warning: rmdir(): No such file or directory with URI (BADDIR\aSubDir) in %s on line %d
8989
-- removing %s\rmdirVar3.tmp\aSubDir --
9090
Directory removed
9191
-- removing %s\.\rmdirVar3.tmp\aSubDir --
@@ -94,7 +94,7 @@ Directory removed
9494
Directory removed
9595
-- removing %s\BADDIR\aSubDir --
9696

97-
Warning: rmdir(): No such file or directory (%s\BADDIR\aSubDir) in %s on line %d
97+
Warning: rmdir(): No such file or directory with URI (%s\BADDIR\aSubDir) in %s on line %d
9898
-- removing rmdirVar3.tmp\aSubDir\ --
9999
Directory removed
100100
-- removing %s\rmdirVar3.tmp\aSubDir\ --

ext/standard/tests/file/tempnam_variation7-win32.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ File created in => temp dir
9999
Warning: tempnam() expects parameter 1 to be a valid path, string given in %stempnam_variation7-win32.php on line %d
100100
-- File is not created --
101101

102-
Warning: unlink(): %r(Invalid argument|No such file or directory)%r (%s) in %s on line %d
102+
Warning: unlink(): %r(Invalid argument|No such file or directory ())%r in %s on line %d
103103
-- Iteration 7 --
104104

105105
Warning: tempnam() expects parameter 1 to be a valid path, array given in %s on line %d
106106
-- File is not created --
107107

108-
Warning: unlink(): %r(Invalid argument|No such file or directory)%r (%s) in %s on line %d
108+
Warning: unlink(): %r(Invalid argument|No such file or directory ())%r in %s on line %d
109109
-- Iteration 8 --
110110

111111
Notice: tempnam(): file created in the system's temporary directory in %stempnam_variation7-win32.php on line %d

0 commit comments

Comments
 (0)