Commit: f3d86b314f4977f95844aa4eaa41759c8d71c247 Author: Anatoliy Belsky <a...@php.net> Mon, 16 Apr 2012 17:06:30 +0200 Parents: bceafee879785b176e6b4564908d0b2c82cb6a0b Branches: PHP-5.3 PHP-5.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f3d86b314f4977f95844aa4eaa41759c8d71c247 Log: Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/* Bugs: https://bugs.php.net/61746 Changed paths: M ext/standard/tests/file/windows_links/bug48746.phpt M ext/standard/tests/file/windows_links/bug48746_1.phpt M ext/standard/tests/file/windows_links/bug48746_2.phpt Diff: diff --git a/ext/standard/tests/file/windows_links/bug48746.phpt b/ext/standard/tests/file/windows_links/bug48746.phpt index 6c88c63..a47b7cb 100644 --- a/ext/standard/tests/file/windows_links/bug48746.phpt +++ b/ext/standard/tests/file/windows_links/bug48746.phpt @@ -17,13 +17,14 @@ if (count($output) == 0) { ?> --FILE-- <?php +$mountvol = "c:\\Windows\\System32\\mountvol.exe"; $old_dir = __DIR__; $dirname = __DIR__ . "\\mnt\\test\\directory"; mkdir($dirname, 0700, true); chdir(__DIR__ . "\\mnt\\test"); $drive = substr(__DIR__, 0, 2); $pathwithoutdrive = substr(__DIR__, 2); -$ret = exec("mountvol " . $drive . " /L", $output, $ret_val); +$ret = exec($mountvol . " " . $drive . " /L", $output, $ret_val); exec("mklink /j mounted_volume " . $ret, $output, $ret_val); $fullpath = "mounted_volume" . $pathwithoutdrive; exec("mklink /j mklink_junction directory", $output, $ret_val); diff --git a/ext/standard/tests/file/windows_links/bug48746_1.phpt b/ext/standard/tests/file/windows_links/bug48746_1.phpt index ca8450a..716c656 100644 --- a/ext/standard/tests/file/windows_links/bug48746_1.phpt +++ b/ext/standard/tests/file/windows_links/bug48746_1.phpt @@ -17,13 +17,14 @@ if (count($output) == 0) { ?> --FILE-- <?php +$mountvol = "c:\\Windows\\System32\\mountvol.exe"; $old_dir = __DIR__; $dirname = __DIR__ . "\\mnt\\test\\directory"; exec("mkdir " . $dirname, $output, $ret_val); chdir(__DIR__ . "\\mnt\\test"); $drive = substr(__DIR__, 0, 2); $pathwithoutdrive = substr(__DIR__, 2); -$ret = exec("mountvol " . $drive . " /L", $output, $ret_val); +$ret = exec($mountvol . " " . $drive . " /L", $output, $ret_val); exec("mklink /j mounted_volume " . $ret, $output, $ret_val); $fullpath = "mounted_volume" . $pathwithoutdrive; exec("mklink /j mklink_junction directory", $output, $ret_val); diff --git a/ext/standard/tests/file/windows_links/bug48746_2.phpt b/ext/standard/tests/file/windows_links/bug48746_2.phpt index 7beed16..637152c 100644 --- a/ext/standard/tests/file/windows_links/bug48746_2.phpt +++ b/ext/standard/tests/file/windows_links/bug48746_2.phpt @@ -17,13 +17,14 @@ unlink('mklink bug48746_tmp.lnk'); ?> --FILE-- <?php +$mountvol = "c:\\Windows\\System32\\mountvol.exe"; $old_dir = __DIR__; $dirname = __DIR__ . "\\mnt\\test\\directory"; exec("mkdir " . $dirname, $output, $ret_val); chdir(__DIR__ . "\\mnt\\test"); $drive = substr(__DIR__, 0, 2); $pathwithoutdrive = substr(__DIR__, 2); -$ret = exec("mountvol " . $drive . " /L", $output, $ret_val); +$ret = exec($mountvol . " " . $drive . " /L", $output, $ret_val); exec("mklink /j mounted_volume " . $ret, $output, $ret_val); $fullpath = "mounted_volume" . $pathwithoutdrive; exec("mklink /j mklink_junction directory", $output, $ret_val); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
