diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-07-10 13:42:13 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-07-10 13:42:13 +0200 |
| commit | 9a5695bfc30103a306a1b0677c526a44b3db100c (patch) | |
| tree | cec107f8a015f6121e333e88c9707dd547b31548 | |
| parent | b7dd8679df0d221682aa4d37a9b10f4ae01c1349 (diff) | |
| parent | 99aa5484e2c5ba73e32cef50ae54495f8dab4023 (diff) | |
| download | php-git-9a5695bfc30103a306a1b0677c526a44b3db100c.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
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 025cc421e9..b0e2329b88 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 e4a2029c55..61a0bec5f4 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.'); } @@ -95,14 +95,14 @@ Warning: fclose(): Argument #1 must be of type resource, bool given in %s on lin --\-- -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(): Argument #1 must be of type 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(): Argument #1 must be of type 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 a200d65a44..64fb48632f 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.'); } @@ -93,14 +93,14 @@ Warning: fclose(): Argument #1 must be of type resource, bool given in %s on lin --\-- -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(): Argument #1 must be of type 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(): Argument #1 must be of type resource, bool given in %s on line %d |