diff --git a/ext/standard/tests/file/windows_links/bug48746.phpt b/ext/standard/tests/file/windows_links/bug48746.phpt index a47b7cbf7aa8c..55465aea8615b 100644 --- a/ext/standard/tests/file/windows_links/bug48746.phpt +++ b/ext/standard/tests/file/windows_links/bug48746.phpt @@ -9,7 +9,8 @@ Venkat Raman Don (don.raman@microsoft.com) if(substr(PHP_OS, 0, 3) != 'WIN' ) { die('skip windows only test'); } -$cmd = "mklink.exe /?"; +include_once __DIR__ . '/common.inc'; +$cmd = "mklink /?"; $ret = @exec($cmd, $output, $return_val); if (count($output) == 0) { die("mklink.exe not found in PATH"); @@ -17,7 +18,8 @@ if (count($output) == 0) { ?> --FILE-- --FILE-- &1', $out); if (strpos($ret, 'privilege')) { die('skip. SeCreateSymbolicLinkPrivilege not enable for this user.'); } -unlink('mklink bug48746_tmp.lnk'); +unlink('bug48746_tmp.lnk'); ?> --FILE-- .. [2] => a.php [3] => b.php -) +) diff --git a/ext/standard/tests/file/windows_links/bug48746_3.phpt b/ext/standard/tests/file/windows_links/bug48746_3.phpt index a0dcbdc0265a3..b88ab76ef3d9a 100644 --- a/ext/standard/tests/file/windows_links/bug48746_3.phpt +++ b/ext/standard/tests/file/windows_links/bug48746_3.phpt @@ -9,7 +9,8 @@ Venkat Raman Don (don.raman@microsoft.com) if(substr(PHP_OS, 0, 3) != 'WIN' ) { die('skip windows only test'); } -$ret = exec('junction /? 2>&1', $out); +include_once __DIR__ . '/common.inc'; +$ret = exec(get_junction().' /? 2>&1', $out); if (strpos($out[0], 'recognized')) { die('skip. junction.exe not found in PATH.'); } @@ -17,11 +18,12 @@ if (strpos($out[0], 'recognized')) { ?> --FILE-- "); file_put_contents("junction\\b.php", ""); include "junction/a.php"; @@ -45,4 +47,4 @@ Array [1] => .. [2] => a.php [3] => b.php -) +) diff --git a/ext/standard/tests/file/windows_links/common.inc b/ext/standard/tests/file/windows_links/common.inc new file mode 100644 index 0000000000000..2d4b47cd513ea --- /dev/null +++ b/ext/standard/tests/file/windows_links/common.inc @@ -0,0 +1,23 @@ +