com php-src: cleanup temporary data: ext/standard/tests/file/bug47767.phpt ext/standard/tests/file/rename_variation6-win32.phpt
| From: | Anatol Belski | Date: | Wed, 14 Dec 2016 11:33:13 +0000 |
| Subject: | com php-src: cleanup temporary data: ext/standard/tests/file/bug47767.phpt ext/standard/tests/file/rename_variation6-win32.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96328@lists.php.net to get a copy of this message | ||
Commit: d663296e3bb5501f15c395990d11c49acf03ef8d
Author: Anatol Belski <ab@php.net> Wed, 14 Dec 2016 12:33:13 +0100
Parents: 4b2cc62e266cb39d0728dc473435fdf6ab4e8e89
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d663296e3bb5501f15c395990d11c49acf03ef8d
Log:
cleanup temporary data
Changed paths:
M ext/standard/tests/file/bug47767.phpt
M ext/standard/tests/file/rename_variation6-win32.phpt
Diff:
diff --git a/ext/standard/tests/file/bug47767.phpt b/ext/standard/tests/file/bug47767.phpt
index 312476a..37db3b1 100644
--- a/ext/standard/tests/file/bug47767.phpt
+++ b/ext/standard/tests/file/bug47767.phpt
@@ -11,7 +11,9 @@ if(PHP_WINDOWS_VERSION_MAJOR < 6) {
die('skip windows version 6.0+ only test');
}
-$ret = exec('mklink rename_variation13tmp.lnk ' . __FILE__ .' 2>&1',
$out);
+$fn = "bug47767.lnk";
+$ret = exec("mklink $fn " . __FILE__ .' 2>&1', $out);
+@unlink($fn);
if (strpos($ret, 'privilege')) {
die('skip. SeCreateSymbolicLinkPrivilege not enable for this user.');
}
@@ -47,4 +49,4 @@ rmdir($junctionname);
Testing include_once using file symbolic link
I am included
Testing include_once using directory symbolic link
-Testing include_once using junction points
\ No newline at end of file
+Testing include_once using junction points
diff --git a/ext/standard/tests/file/rename_variation6-win32.phpt
b/ext/standard/tests/file/rename_variation6-win32.phpt
index 9aab0a7..dfb57f2 100644
--- a/ext/standard/tests/file/rename_variation6-win32.phpt
+++ b/ext/standard/tests/file/rename_variation6-win32.phpt
@@ -4,7 +4,9 @@ Test rename() function: usage variations-6
<?php
if (substr(PHP_OS, 0, 3) != 'WIN') die('skip.. for Windows');
if (!function_exists("symlink")) die("skip symlinks are not supported");
-$ret = exec('mklink rename_variation13tmp.lnk ' . __FILE__ .' 2>&1',
$out);
+$fn = "rename_variation6tmp.lnk";
+$ret = exec("mklink $fn " . __FILE__ .' 2>&1', $out);
+@unlink($fn);
if (strpos($ret, 'privilege')) {
die('skip. SeCreateSymbolicLinkPrivilege not enable for this user.');
}