diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-07-10 11:19:01 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-07-10 13:36:41 +0200 |
| commit | 99aa5484e2c5ba73e32cef50ae54495f8dab4023 (patch) | |
| tree | 74df3e17490ef48af9fdf4e906793d017ac020e5 | |
| parent | 7edc5e5e39dc599f5ee436f85e7cf59c9260bca5 (diff) | |
| download | php-git-99aa5484e2c5ba73e32cef50ae54495f8dab4023.tar.gz | |
Enable further ext/standard/tests/file tests on Windows
| -rw-r--r-- | ext/standard/tests/file/fileinode_variation.phpt | 5 | ||||
| -rw-r--r-- | ext/standard/tests/file/fopen_variation10-win32.phpt | 6 | ||||
| -rw-r--r-- | ext/standard/tests/file/fopen_variation11-win32.phpt | 6 |
3 files changed, 9 insertions, 8 deletions
diff --git a/ext/standard/tests/file/fileinode_variation.phpt b/ext/standard/tests/file/fileinode_variation.phpt index 881aa2ce59..4006d94ffa 100644 --- a/ext/standard/tests/file/fileinode_variation.phpt +++ b/ext/standard/tests/file/fileinode_variation.phpt @@ -2,8 +2,9 @@ Test fileinode() function: Variations --SKIPIF-- <?php -if (substr(PHP_OS, 0, 3) == 'WIN') { - die('skip no link()/symlink() on Windows'); +if (PHP_OS_FAMILY === 'Windows') { + require_once __DIR__ . '/windows_links/common.inc'; + skipIfSeCreateSymbolicLinkPrivilegeIsDisabled(__FILE__); } ?> --FILE-- diff --git a/ext/standard/tests/file/fopen_variation10-win32.phpt b/ext/standard/tests/file/fopen_variation10-win32.phpt index 300cf52864..8041c59c84 100644 --- a/ext/standard/tests/file/fopen_variation10-win32.phpt +++ b/ext/standard/tests/file/fopen_variation10-win32.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> if(substr(PHP_OS, 0, 3) != "WIN") die("skip Run only on Windows"); -if (!is_writable('c:\\fopen_variation10.tmp')) { +if (!is_writable('c:\\')) { die('skip. C:\\ not writable.'); } @@ -102,14 +102,14 @@ Warning: fclose() expects parameter 1 to be resource, bool given in %s on line % --\-- -Warning: fopen(\\fopen_variation10.tmp): failed to open stream: Invalid argument in %s on line %d +Warning: fopen(\\fopen_variation10.tmp): failed to open stream: No such file or directory in %s on line %d file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d --/-- -Warning: fopen(/\fopen_variation10.tmp): failed to open stream: Invalid argument in %s on line %d +Warning: fopen(/\fopen_variation10.tmp): failed to open stream: No such file or directory in %s on line %d file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d diff --git a/ext/standard/tests/file/fopen_variation11-win32.phpt b/ext/standard/tests/file/fopen_variation11-win32.phpt index ed6508b69a..e40c48841d 100644 --- a/ext/standard/tests/file/fopen_variation11-win32.phpt +++ b/ext/standard/tests/file/fopen_variation11-win32.phpt @@ -6,7 +6,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> <?php if(substr(PHP_OS, 0, 3) != "WIN") die("skip Run only on Windows"); -if (!is_writable('c:\\fopen_variation10.tmp')) { +if (!is_writable('c:\\')) { die('skip. C:\\ not writable.'); } @@ -100,14 +100,14 @@ Warning: fclose() expects parameter 1 to be resource, bool given in %s on line % --\-- -Warning: fopen(\\FOPEN_VARIATION11.TMP): failed to open stream: Invalid argument in %s on line %d +Warning: fopen(\\FOPEN_VARIATION11.TMP): failed to open stream: No such file or directory in %s on line %d file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d --/-- -Warning: fopen(\\FOPEN_VARIATION11.TMP): failed to open stream: Invalid argument in %s on line %d +Warning: fopen(\\FOPEN_VARIATION11.TMP): failed to open stream: No such file or directory in %s on line %d file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d |