Skip to content

Commit 99aa548

Browse files
committed
Enable further ext/standard/tests/file tests on Windows
1 parent 7edc5e5 commit 99aa548

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

ext/standard/tests/file/fileinode_variation.phpt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
Test fileinode() function: Variations
33
--SKIPIF--
44
<?php
5-
if (substr(PHP_OS, 0, 3) == 'WIN') {
6-
die('skip no link()/symlink() on Windows');
5+
if (PHP_OS_FAMILY === 'Windows') {
6+
require_once __DIR__ . '/windows_links/common.inc';
7+
skipIfSeCreateSymbolicLinkPrivilegeIsDisabled(__FILE__);
78
}
89
?>
910
--FILE--

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
77
if(substr(PHP_OS, 0, 3) != "WIN")
88
die("skip Run only on Windows");
99

10-
if (!is_writable('c:\\fopen_variation10.tmp')) {
10+
if (!is_writable('c:\\')) {
1111
die('skip. C:\\ not writable.');
1212
}
1313

@@ -102,14 +102,14 @@ Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %
102102

103103
--\--
104104

105-
Warning: fopen(\\fopen_variation10.tmp): failed to open stream: Invalid argument in %s on line %d
105+
Warning: fopen(\\fopen_variation10.tmp): failed to open stream: No such file or directory in %s on line %d
106106
file not opened for read
107107

108108
Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d
109109

110110
--/--
111111

112-
Warning: fopen(/\fopen_variation10.tmp): failed to open stream: Invalid argument in %s on line %d
112+
Warning: fopen(/\fopen_variation10.tmp): failed to open stream: No such file or directory in %s on line %d
113113
file not opened for read
114114

115115
Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
66
<?php
77
if(substr(PHP_OS, 0, 3) != "WIN")
88
die("skip Run only on Windows");
9-
if (!is_writable('c:\\fopen_variation10.tmp')) {
9+
if (!is_writable('c:\\')) {
1010
die('skip. C:\\ not writable.');
1111
}
1212

@@ -100,14 +100,14 @@ Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %
100100

101101
--\--
102102

103-
Warning: fopen(\\FOPEN_VARIATION11.TMP): failed to open stream: Invalid argument in %s on line %d
103+
Warning: fopen(\\FOPEN_VARIATION11.TMP): failed to open stream: No such file or directory in %s on line %d
104104
file not opened for read
105105

106106
Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d
107107

108108
--/--
109109

110-
Warning: fopen(\\FOPEN_VARIATION11.TMP): failed to open stream: Invalid argument in %s on line %d
110+
Warning: fopen(\\FOPEN_VARIATION11.TMP): failed to open stream: No such file or directory in %s on line %d
111111
file not opened for read
112112

113113
Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d

0 commit comments

Comments
 (0)