summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-03-06 16:40:14 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2020-03-06 16:40:14 +0100
commita595b82665a5b5b9557abebd4e8a242bdfc579a0 (patch)
tree9f7148f45cc8104dad1762c7edfe9210f4e21f3f
parent979978cb61281347ddde7f653ad7c7af04f87739 (diff)
parentdc4f42508dc109d6e8d86ab279b8438bb341f112 (diff)
downloadphp-git-a595b82665a5b5b9557abebd4e8a242bdfc579a0.tar.gz
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Skip test on Windows if privileges are insufficient
-rw-r--r--ext/spl/tests/bug68825.phpt11
1 files changed, 11 insertions, 0 deletions
diff --git a/ext/spl/tests/bug68825.phpt b/ext/spl/tests/bug68825.phpt
index e662503611..35c837d336 100644
--- a/ext/spl/tests/bug68825.phpt
+++ b/ext/spl/tests/bug68825.phpt
@@ -1,5 +1,16 @@
--TEST--
Bug #68825 (Exception in DirectoryIterator::getLinkTarget())
+--SKIPIF--
+<?php
+if (PHP_OS_FAMILY === 'Windows') {
+ $fn = "bug68825.lnk";
+ $ret = exec("mklink $fn " . __FILE__ .' 2>&1', $out);
+ @unlink($fn);
+ if (strpos($ret, 'privilege')) {
+ die('skip. SeCreateSymbolicLinkPrivilege not enable for this user.');
+ }
+}
+?>
--FILE--
<?php
$dir = __DIR__ . '/bug68825';