[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/config.w32 trunk/win32/build/config.w32
pajoye Mon, 24 Aug 2009 14:18:19 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=287638
Log:
- fix object dir usage (ie: relative path called from a symlinked dir), also
fix nmake test for similar cases
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/config.w32
U php/php-src/trunk/win32/build/config.w32
Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32
===
--- php/php-src/branches/PHP_5_3/win32/build/config.w32 2009-08-24 14:10:30 UTC
(rev 287637)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2009-08-24 14:18:19 UTC
(rev 287638)
@@ -82,6 +82,7 @@
// stick objects somewhere outside of the source tree
ARG_ENABLE('object-out-dir', 'Alternate location for binary objects during
build', '');
if (PHP_OBJECT_OUT_DIR.length) {
+ PHP_OBJECT_OUT_DIR = FSO.GetAbsolutePathName(PHP_OBJECT_OUT_DIR);
if (!FSO.FolderExists(PHP_OBJECT_OUT_DIR)) {
ERROR('you chosen output directory ' + PHP_OBJECT_OUT_DIR + '
does not exist');
}
Modified: php/php-src/trunk/win32/build/config.w32
===
--- php/php-src/trunk/win32/build/config.w322009-08-24 14:10:30 UTC (rev
287637)
+++ php/php-src/trunk/win32/build/config.w322009-08-24 14:18:19 UTC (rev
287638)
@@ -82,6 +82,7 @@
// stick objects somewhere outside of the source tree
ARG_ENABLE('object-out-dir', 'Alternate location for binary objects during
build', '');
if (PHP_OBJECT_OUT_DIR.length) {
+ PHP_OBJECT_OUT_DIR = FSO.GetAbsolutePathName(PHP_OBJECT_OUT_DIR);
if (!FSO.FolderExists(PHP_OBJECT_OUT_DIR)) {
ERROR('you chosen output directory ' + PHP_OBJECT_OUT_DIR + '
does not exist');
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
derick Mon, 24 Aug 2009 14:23:02 + Revision: http://svn.php.net/viewvc?view=revisionrevision=287639 Log: - Give fourd access, and removed dams, on Damien's request. Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2009-08-24 14:18:19 UTC (rev 287638) +++ SVNROOT/global_avail2009-08-24 14:23:02 UTC (rev 287639) @@ -297,7 +297,7 @@ avail|kaigai|pecl/selinux,phpdoc avail|kannan,veeve,cjiang|pecl/xhprof,phpdoc avail|bhuisgen|pecl/htscanner -avail|dams,splanquart|pecl/pdo_4d +avail|splanquart,fourd|pecl/pdo_4d avail|jluedke|pecl/gearman avail|jluedke|pecl/drizzle avail|vito,mkoppanen|pecl/gmagick -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ pear_avail
saltybeagle Mon, 24 Aug 2009 18:30:20 + Revision: http://svn.php.net/viewvc?view=revisionrevision=287646 Log: Grant Brion Vibber (brion) access to pear/packages/File_Gettext Changed paths: U SVNROOT/pear_avail Modified: SVNROOT/pear_avail === --- SVNROOT/pear_avail 2009-08-24 17:54:33 UTC (rev 287645) +++ SVNROOT/pear_avail 2009-08-24 18:30:20 UTC (rev 287646) @@ -176,6 +176,7 @@ avail|mrook|pear/packages/VersionControl_SVN,pear/packages/Archive_Tar avail|bishop|pear/packages/Net_SMS avail|progi1984|pear/packages/Spreadsheet_Excel_Writer +avail|brion|pear/packages/File_Gettext # But members of the PHP Group get access to everything. # Note: This line MUST be at the end so that it overrides any unavail settings -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/file/touch_variation5-win32.phpt trunk/ext/standard/tests/file/touch_variation5-win32.phpt
pajoye Mon, 24 Aug 2009 18:43:21 + Revision: http://svn.php.net/viewvc?view=revisionrevision=287648 Log: - fix test Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/file/touch_variation5-win32.phpt U php/php-src/trunk/ext/standard/tests/file/touch_variation5-win32.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/touch_variation5-win32.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/file/touch_variation5-win32.phpt 2009-08-24 18:40:13 UTC (rev 287647) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/touch_variation5-win32.phpt 2009-08-24 18:43:21 UTC (rev 287648) @@ -17,8 +17,9 @@ $workDir = touchVar5.tmp; $subDirOrFile = aSubDirOrFile; -mkdir($workDir); -$cwd = getcwd(); +$cwd = __DIR__; +chdir($cwd); +if (!mkdir($cwd . '/' . $workDir)) die(cannot create directory $workDir); $paths = array( // relative Modified: php/php-src/trunk/ext/standard/tests/file/touch_variation5-win32.phpt === --- php/php-src/trunk/ext/standard/tests/file/touch_variation5-win32.phpt 2009-08-24 18:40:13 UTC (rev 287647) +++ php/php-src/trunk/ext/standard/tests/file/touch_variation5-win32.phpt 2009-08-24 18:43:21 UTC (rev 287648) @@ -17,8 +17,9 @@ $workDir = touchVar5.tmp; $subDirOrFile = aSubDirOrFile; -mkdir($workDir); -$cwd = getcwd(); +$cwd = __DIR__; +chdir($cwd); +if (!mkdir($cwd . '/' . $workDir)) die(cannot create directory $workDir); $paths = array( // relative -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/tests/file/ 005_variation2-win32.phpt
pajoye Mon, 24 Aug 2009 18:44:59 + Revision: http://svn.php.net/viewvc?view=revisionrevision=287649 Log: - fix test Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/file/005_variation2-win32.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/005_variation2-win32.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/file/005_variation2-win32.phpt 2009-08-24 18:43:21 UTC (rev 287648) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/005_variation2-win32.phpt 2009-08-24 18:44:59 UTC (rev 287649) @@ -108,13 +108,13 @@ *** testing touch *** -Warning: touch(): Unable to create file because No such file or directory in %s on line %d +Warning: touch(): Unable to create file because %s in %s on line %d bool(false) -Warning: touch(): Unable to create file because No such file or directory in %s on line %d +Warning: touch(): Unable to create file because %s in %s on line %d bool(false) -Warning: touch(): Unable to create file because No such file or directory in %s on line %d +Warning: touch(): Unable to create file because %s in %s on line %d bool(false) Warning: touch(): Unable to create file because %s in %s on line %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/standard/tests/file/ 005_variation2-win32.phpt
pajoye Mon, 24 Aug 2009 18:45:45 + Revision: http://svn.php.net/viewvc?view=revisionrevision=287650 Log: - fix test Changed paths: U php/php-src/trunk/ext/standard/tests/file/005_variation2-win32.phpt Modified: php/php-src/trunk/ext/standard/tests/file/005_variation2-win32.phpt === --- php/php-src/trunk/ext/standard/tests/file/005_variation2-win32.phpt 2009-08-24 18:44:59 UTC (rev 287649) +++ php/php-src/trunk/ext/standard/tests/file/005_variation2-win32.phpt 2009-08-24 18:45:45 UTC (rev 287650) @@ -108,13 +108,13 @@ *** testing touch *** -Warning: touch(): Unable to create file because No such file or directory in %s on line %d +Warning: touch(): Unable to create file because %s in %s on line %d bool(false) -Warning: touch(): Unable to create file because No such file or directory in %s on line %d +Warning: touch(): Unable to create file because %s in %s on line %d bool(false) -Warning: touch(): Unable to create file because No such file or directory in %s on line %d +Warning: touch(): Unable to create file because %s in %s on line %d bool(false) Warning: touch(): Unable to create file because %s in %s on line %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/standard/pack.c branches/PHP_5_3/ext/standard/pack.c trunk/ext/standard/pack.c
iliaaMon, 24 Aug 2009 18:40:13 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=287647
Log:
Don't clober variables
Changed paths:
U php/php-src/branches/PHP_5_2/ext/standard/pack.c
U php/php-src/branches/PHP_5_3/ext/standard/pack.c
U php/php-src/trunk/ext/standard/pack.c
Modified: php/php-src/branches/PHP_5_2/ext/standard/pack.c
===
--- php/php-src/branches/PHP_5_2/ext/standard/pack.c2009-08-24 18:30:20 UTC
(rev 287646)
+++ php/php-src/branches/PHP_5_2/ext/standard/pack.c2009-08-24 18:40:13 UTC
(rev 287647)
@@ -708,15 +708,15 @@
buf = emalloc(len + 1);
for (ipos = opos = 0; opos
len; opos++) {
- char c =
(input[inputpos + ipos] nibbleshift) 0xf;
+ char cc =
(input[inputpos + ipos] nibbleshift) 0xf;
- if (c 10) {
- c += '0';
+ if (cc 10) {
+ cc += '0';
} else {
- c += 'a' - 10;
+ cc += 'a' - 10;
}
- buf[opos] = c;
+ buf[opos] = cc;
nibbleshift =
(nibbleshift + 4) 7;
if (first-- == 0) {
Modified: php/php-src/branches/PHP_5_3/ext/standard/pack.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/pack.c2009-08-24 18:30:20 UTC
(rev 287646)
+++ php/php-src/branches/PHP_5_3/ext/standard/pack.c2009-08-24 18:40:13 UTC
(rev 287647)
@@ -693,15 +693,15 @@
buf = emalloc(len + 1);
for (ipos = opos = 0; opos
len; opos++) {
- char c =
(input[inputpos + ipos] nibbleshift) 0xf;
+ char cc =
(input[inputpos + ipos] nibbleshift) 0xf;
- if (c 10) {
- c += '0';
+ if (cc 10) {
+ cc += '0';
} else {
- c += 'a' - 10;
+ cc += 'a' - 10;
}
- buf[opos] = c;
+ buf[opos] = cc;
nibbleshift =
(nibbleshift + 4) 7;
if (first-- == 0) {
Modified: php/php-src/trunk/ext/standard/pack.c
===
--- php/php-src/trunk/ext/standard/pack.c 2009-08-24 18:30:20 UTC (rev
287646)
+++ php/php-src/trunk/ext/standard/pack.c 2009-08-24 18:40:13 UTC (rev
287647)
@@ -686,15 +686,15 @@
buf = emalloc(len + 1);
for (ipos = opos = 0; opos
len; opos++) {
- char c =
(input[inputpos + ipos] nibbleshift) 0xf;
+ char cc =
(input[inputpos + ipos] nibbleshift) 0xf;
- if (c 10) {
- c += '0';
+ if (cc 10) {
+ cc += '0';
} else {
- c += 'a' - 10;
+ cc += 'a' - 10;
}
- buf[opos] = c;
+ buf[opos] = cc;
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/file/touch_variation6-win32.phpt trunk/ext/standard/tests/file/touch_variation6-win32.phpt
pajoye Mon, 24 Aug 2009 19:19:43 + Revision: http://svn.php.net/viewvc?view=revisionrevision=287651 Log: - fix test Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/file/touch_variation6-win32.phpt U php/php-src/trunk/ext/standard/tests/file/touch_variation6-win32.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/touch_variation6-win32.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/file/touch_variation6-win32.phpt 2009-08-24 18:45:45 UTC (rev 287650) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/touch_variation6-win32.phpt 2009-08-24 19:19:43 UTC (rev 287651) @@ -18,6 +18,7 @@ $workDir = touchVar5.tmp; $subDirOrFile = aSubDirOrFile; +chdir(__DIR__); mkdir($workDir); $cwd = getcwd(); Modified: php/php-src/trunk/ext/standard/tests/file/touch_variation6-win32.phpt === --- php/php-src/trunk/ext/standard/tests/file/touch_variation6-win32.phpt 2009-08-24 18:45:45 UTC (rev 287650) +++ php/php-src/trunk/ext/standard/tests/file/touch_variation6-win32.phpt 2009-08-24 19:19:43 UTC (rev 287651) @@ -18,6 +18,7 @@ $workDir = touchVar5.tmp; $subDirOrFile = aSubDirOrFile; +chdir(__DIR__); mkdir($workDir); $cwd = getcwd(); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c trunk/TSRM/tsrm_virtual_cwd.c
pajoye Mon, 24 Aug 2009 20:27:52 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=287654
Log:
- split atime and mtime
Changed paths:
U php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
U php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c2009-08-24
20:03:26 UTC (rev 287653)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c2009-08-24
20:27:52 UTC (rev 287654)
@@ -271,9 +271,6 @@
buf-st_atime = FileTimeToUnixTime(data.ftLastAccessTime);
buf-st_ctime = FileTimeToUnixTime(data.ftCreationTime);
buf-st_mtime = FileTimeToUnixTime(data.ftLastWriteTime);
- if (buf-st_mtime != buf-st_atime) {
- buf-st_atime = buf-st_mtime;
- }
return 0;
}
/* }}} */
@@ -741,6 +738,7 @@
return -1;
}
}
+ directory = (data.dwFileAttributes
FILE_ATTRIBUTE_DIRECTORY) != 0;
if(link_is_dir) {
*link_is_dir = directory;
@@ -988,6 +986,7 @@
add_slash = (use_realpath != CWD_REALPATH) path_length 0
IS_SLASH(resolved_path[path_length-1]);
t = CWDG(realpath_cache_ttl) ? 0 : -1;
+
path_length = tsrm_realpath_r(resolved_path, start, path_length, ll,
t, use_realpath, 0, NULL TSRMLS_CC);
if (path_length 0) {
Modified: php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2009-08-24 20:03:26 UTC (rev
287653)
+++ php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2009-08-24 20:27:52 UTC (rev
287654)
@@ -271,9 +271,6 @@
buf-st_atime = FileTimeToUnixTime(data.ftLastAccessTime);
buf-st_ctime = FileTimeToUnixTime(data.ftCreationTime);
buf-st_mtime = FileTimeToUnixTime(data.ftLastWriteTime);
- if (buf-st_mtime != buf-st_atime) {
- buf-st_atime = buf-st_mtime;
- }
return 0;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c trunk/TSRM/tsrm_virtual_cwd.c
pajoye Mon, 24 Aug 2009 20:32:11 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=287655
Log:
- that part was for a separate fix
Changed paths:
U php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
U php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c2009-08-24
20:27:52 UTC (rev 287654)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c2009-08-24
20:32:11 UTC (rev 287655)
@@ -738,7 +738,6 @@
return -1;
}
}
- directory = (data.dwFileAttributes
FILE_ATTRIBUTE_DIRECTORY) != 0;
if(link_is_dir) {
*link_is_dir = directory;
@@ -1194,7 +1193,7 @@
}
/* }}} */
-static int win32_utime(const char *filename, struct utimbuf *buf) /* {{{ */
+TSRM_API int win32_utime(const char *filename, struct utimbuf *buf) /* {{{ */
{
FILETIME mtime, atime;
HANDLE hFile;
Modified: php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2009-08-24 20:27:52 UTC (rev
287654)
+++ php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2009-08-24 20:32:11 UTC (rev
287655)
@@ -1192,7 +1192,7 @@
}
/* }}} */
-static int win32_utime(const char *filename, struct utimbuf *buf) /* {{{ */
+TSRM_API int win32_utime(const char *filename, struct utimbuf *buf) /* {{{ */
{
FILETIME mtime, atime;
HANDLE hFile;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c trunk/TSRM/tsrm_virtual_cwd.c
pajoye Mon, 24 Aug 2009 20:33:36 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=287656
Log:
- sigh. that too (separate fix).
Changed paths:
U php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
U php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c2009-08-24
20:32:11 UTC (rev 287655)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c2009-08-24
20:33:36 UTC (rev 287656)
@@ -1193,7 +1193,7 @@
}
/* }}} */
-TSRM_API int win32_utime(const char *filename, struct utimbuf *buf) /* {{{ */
+static int win32_utime(const char *filename, struct utimbuf *buf) /* {{{ */
{
FILETIME mtime, atime;
HANDLE hFile;
Modified: php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2009-08-24 20:32:11 UTC (rev
287655)
+++ php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2009-08-24 20:33:36 UTC (rev
287656)
@@ -1192,7 +1192,7 @@
}
/* }}} */
-TSRM_API int win32_utime(const char *filename, struct utimbuf *buf) /* {{{ */
+static int win32_utime(const char *filename, struct utimbuf *buf) /* {{{ */
{
FILETIME mtime, atime;
HANDLE hFile;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/file/unlink_variation9-win32.phpt trunk/ext/standard/tests/file/unlink_variation9-win32.phpt
pajoye Tue, 25 Aug 2009 00:14:23 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=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
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/file/realpath_basic2.phpt trunk/ext/standard/tests/file/realpath_basic2.phpt
pajoye Tue, 25 Aug 2009 00:22:11 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=287658
Log:
- fix test when part of the path is a symlink
Changed paths:
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/realpath_basic2.phpt
U php/php-src/trunk/ext/standard/tests/file/realpath_basic2.phpt
Modified:
php/php-src/branches/PHP_5_3/ext/standard/tests/file/realpath_basic2.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/realpath_basic2.phpt
2009-08-25 00:14:23 UTC (rev 287657)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/realpath_basic2.phpt
2009-08-25 00:22:11 UTC (rev 287658)
@@ -3,9 +3,9 @@
--FILE--
?php
-var_dump(realpath('.') == getcwd());
+var_dump(realpath('.') == realpath(getcwd()));
chdir('..');
-var_dump(realpath('.') == getcwd());
+var_dump(realpath('.') == realpath(getcwd()));
?
--EXPECT--
Modified: php/php-src/trunk/ext/standard/tests/file/realpath_basic2.phpt
===
--- php/php-src/trunk/ext/standard/tests/file/realpath_basic2.phpt
2009-08-25 00:14:23 UTC (rev 287657)
+++ php/php-src/trunk/ext/standard/tests/file/realpath_basic2.phpt
2009-08-25 00:22:11 UTC (rev 287658)
@@ -3,9 +3,9 @@
--FILE--
?php
-var_dump(realpath('.') == getcwd());
+var_dump(realpath('.') == realpath(getcwd()));
chdir('..');
-var_dump(realpath('.') == getcwd());
+var_dump(realpath('.') == realpath(getcwd()));
?
--EXPECT--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
