Skip to content

Commit 765cebf

Browse files
committed
Adapt tests to Windows 11
Apparently, one of the more recent patch releases of Windows 10 (confirmed for Windows 10.0.26100, but may affect older versions, too) changed treatment of filenames with trailing slashes to be recognized explicitly as directories, and no longer as invalid file or directory. We adapt the affected test cases. Closes GH-17804.
1 parent c7bc14d commit 765cebf

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ bool(false)
6161
bool(true)
6262
-- Iteration 2 --
6363

64-
Warning: rename(%s/rename_variation-win32/rename_variation.tmp/,%s/rename_variation2.tmp): The filename, directory name, or volume label syntax is incorrect (code: 123) in %s on line %d
64+
Warning: rename(%s/rename_variation-win32/rename_variation.tmp/,%s/rename_variation2.tmp): %rThe filename, directory name, or volume label syntax is incorrect|The directory name is invalid%r (code: %r123|267%r) in %s on line %d
6565
bool(false)
6666
bool(false)
6767
bool(false)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ file removed
9595
Warning: unlink(%s/BADDIR/file.tmp): No such file or directory in %s on line %d
9696
-- removing unlinkVar8.tmp/file.tmp/ --
9797

98-
Warning: unlink(unlinkVar8.tmp/file.tmp/): No such file or directory in %s on line %d
98+
Warning: unlink(unlinkVar8.tmp/file.tmp/): %rNo such file or directory|Not a directory%r in %s on line %d
9999
-- removing %s/unlinkVar8.tmp/file.tmp/ --
100100

101-
Warning: unlink(%s/unlinkVar8.tmp/file.tmp/): No such file or directory in %s on line %d
101+
Warning: unlink(%s/unlinkVar8.tmp/file.tmp/): %rNo such file or directory|Not a directory%r in %s on line %d
102102
-- removing unlinkVar8.tmp//file.tmp --
103103
file removed
104104
-- removing %s//unlinkVar8.tmp//file.tmp --

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ file removed
9797
Warning: unlink(%s\BADDIR\file.tmp): No such file or directory in %s on line %d
9898
-- removing unlinkVar9.tmp\file.tmp\ --
9999

100-
Warning: unlink(unlinkVar9.tmp\file.tmp\): No such file or directory in %s on line %d
100+
Warning: unlink(unlinkVar9.tmp\file.tmp\): %rNo such file or directory|Not a directory%r in %s on line %d
101101
-- removing %s\unlinkVar9.tmp\file.tmp\ --
102102

103-
Warning: unlink(%s\unlinkVar9.tmp\file.tmp\): No such file or directory in %s on line %d
103+
Warning: unlink(%s\unlinkVar9.tmp\file.tmp\): %rNo such file or directory|Not a directory%r in %s on line %d
104104
-- removing unlinkVar9.tmp\\file.tmp --
105105
file removed
106106
-- removing %s\\unlinkVar9.tmp\\file.tmp --

0 commit comments

Comments
 (0)