Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*

Author: weltling

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);

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);

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);