From: Pierre Joye <pajoye@php.net>
Date: Sat, 30 Jan 2010 21:24:04 +0000 (+0000)
Subject: - fix skip clauses
X-Git-Tag: php-5.4.0alpha1~191^2~2011
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5eac4626fb8c79f494c88db8d5ae585a8b0b7792;p=php

- fix skip clauses
---

diff --git a/ext/standard/tests/file/windows_links/bug48746_2.phpt b/ext/standard/tests/file/windows_links/bug48746_2.phpt
index a8cf48d3a8..c8c335f12f 100644
--- a/ext/standard/tests/file/windows_links/bug48746_2.phpt
+++ b/ext/standard/tests/file/windows_links/bug48746_2.phpt
@@ -9,11 +9,11 @@ Venkat Raman Don (don.raman@microsoft.com)
 if(substr(PHP_OS, 0, 3) != 'WIN' ) {
     die('skip windows only test');
 }
-$cmd = "mklink.exe /?";
-$ret = @exec($cmd, $output, $return_val);
-if (count($output) == 0) {
-    die("mklink.exe not found in PATH");
+$ret = exec('mklink bug48746_tmp.lnk ' . __FILE__ .' 2>&1', $out);
+if (strpos($ret, 'privilege')) {
+	die('skip. SeCreateSymbolicLinkPrivilege not enable for this user.');
 }
+unlink('mklink bug48746_tmp.lnk');
 ?>
 --FILE--
 <?php
@@ -63,4 +63,4 @@ Array
     [1] => ..
     [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 ebc31ea598..e6de9c848f 100644
--- a/ext/standard/tests/file/windows_links/bug48746_3.phpt
+++ b/ext/standard/tests/file/windows_links/bug48746_3.phpt
@@ -7,13 +7,13 @@ Venkat Raman Don (don.raman@microsoft.com)
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) != 'WIN' ) {
-    die('skip windows only test');
+	die('skip windows only test');
 }
-$cmd = "junction.exe /?";
-$ret = @exec($cmd, $output, $return_val);
-if (count($output) == 0) {
-    die("junction.exe not found in PATH");
+$ret = exec('junction /? 2>&1', $out);
+if (strpos($out[0], 'recognized')) {
+	die('skip. junction.exe not found in PATH.');
 }
+
 ?>
 --FILE--
 <?php
@@ -45,4 +45,4 @@ Array
     [1] => ..
     [2] => a.php
     [3] => b.php
-)
+)