pajoye Tue, 25 Aug 2009 00:14:23 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=287657
Log: - fix test Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/file/unlink_variation9-win32.phpt U php/php-src/trunk/ext/standard/tests/file/unlink_variation9-win32.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/unlink_variation9-win32.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/standard/tests/file/unlink_variation9-win32.phpt 2009-08-24 20:33:36 UTC (rev 287656) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/unlink_variation9-win32.phpt 2009-08-25 00:14:23 UTC (rev 287657) @@ -20,8 +20,9 @@ $workDir = "unlinkVar9.tmp"; $tmpFile = "file.tmp"; +chdir(__DIR__); mkdir($workDir); -$cwd = getcwd(); +$cwd = __DIR__; $unixifiedFile = '/'.substr(str_replace('\\','/',$cwd).'/'.$workDir.'/'.$tmpFile, 3); $files = array( @@ -57,12 +58,8 @@ foreach($files as $fileToUnlink) { - test_realfile($workDir.'/'.$tmpFile, $fileToUnlink); -} - -rmdir($workDir); - -function test_realfile($file, $tounlink) { + $file = $workDir.'/'.$tmpFile; + $tounlink = $fileToUnlink; touch($file); echo "-- removing $tounlink --\n"; $res = unlink($tounlink); @@ -79,7 +76,7 @@ } } - +rmdir($workDir); ?> ===DONE=== --EXPECTF-- @@ -117,4 +114,4 @@ file removed -- removing /%s/unlinkVar9.tmp/file.tmp -- file removed -===DONE=== \ No newline at end of file +===DONE=== Modified: php/php-src/trunk/ext/standard/tests/file/unlink_variation9-win32.phpt =================================================================== --- php/php-src/trunk/ext/standard/tests/file/unlink_variation9-win32.phpt 2009-08-24 20:33:36 UTC (rev 287656) +++ php/php-src/trunk/ext/standard/tests/file/unlink_variation9-win32.phpt 2009-08-25 00:14:23 UTC (rev 287657) @@ -20,8 +20,9 @@ $workDir = "unlinkVar9.tmp"; $tmpFile = "file.tmp"; +chdir(__DIR__); mkdir($workDir); -$cwd = getcwd(); +$cwd = __DIR__; $unixifiedFile = '/'.substr(str_replace('\\','/',$cwd).'/'.$workDir.'/'.$tmpFile, 3); $files = array( @@ -57,12 +58,8 @@ foreach($files as $fileToUnlink) { - test_realfile($workDir.'/'.$tmpFile, $fileToUnlink); -} - -rmdir($workDir); - -function test_realfile($file, $tounlink) { + $file = $workDir.'/'.$tmpFile; + $tounlink = $fileToUnlink; touch($file); echo "-- removing $tounlink --\n"; $res = unlink($tounlink); @@ -79,7 +76,7 @@ } } - +rmdir($workDir); ?> ===DONE=== --EXPECTF--
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php