rasmus Mon, 10 Aug 2009 06:53:49 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=286988
Log:
Tweak a few tests that failed on OSX
Changed paths:
U
php/php-src/branches/PHP_5_2/ext/standard/tests/file/touch_variation5.phpt
U
php/php-src/branches/PHP_5_2/ext/standard/tests/file/unlink_variation8.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/touch_variation5.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/unlink_variation8.phpt
U php/php-src/trunk/ext/standard/tests/file/touch_variation5.phpt
U php/php-src/trunk/ext/standard/tests/file/unlink_variation8.phpt
Modified:
php/php-src/branches/PHP_5_2/ext/standard/tests/file/touch_variation5.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/tests/file/touch_variation5.phpt
2009-08-10 06:19:41 UTC (rev 286987)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/file/touch_variation5.phpt
2009-08-10 06:53:49 UTC (rev 286988)
@@ -178,10 +178,10 @@
Warning: touch(): Unable to create file /%s/BADDIR/aSubDirOrFile because %s in
%s on line %d
--- testing touchVar5.tmp/aSubDirOrFile/ ---
-Warning: touch(): Unable to create file touchVar5.tmp/aSubDirOrFile/ because
Is a directory in %s on line %d
+Warning: touch(): Unable to create file touchVar5.tmp/aSubDirOrFile/ because
%s in %s on line %d
--- testing /%s/touchVar5.tmp/aSubDirOrFile/ ---
-Warning: touch(): Unable to create file /%s/touchVar5.tmp/aSubDirOrFile/
because Is a directory in %s on line %d
+Warning: touch(): Unable to create file /%s/touchVar5.tmp/aSubDirOrFile/
because %s in %s on line %d
--- testing touchVar5.tmp//aSubDirOrFile ---
PASSED: touchVar5.tmp//aSubDirOrFile - created
--- testing /%s//touchVar5.tmp//aSubDirOrFile ---
Modified:
php/php-src/branches/PHP_5_2/ext/standard/tests/file/unlink_variation8.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/tests/file/unlink_variation8.phpt
2009-08-10 06:19:41 UTC (rev 286987)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/file/unlink_variation8.phpt
2009-08-10 06:53:49 UTC (rev 286988)
@@ -178,7 +178,7 @@
Warning: unlink(unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
-- unlinking soft link unlinkVar8.tmp/file.tmp/ --
-Warning: unlink(unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
+Warning: unlink(unlinkVar8.tmp/file.tmp/): %s directory in %s on line %d
-- unlinking hard link unlinkVar8.tmp/file.tmp/ --
Warning: unlink(unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
@@ -187,7 +187,7 @@
Warning: unlink(/%s/unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
-- unlinking soft link /%s/unlinkVar8.tmp/file.tmp/ --
-Warning: unlink(/%s/unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
+Warning: unlink(/%s/unlinkVar8.tmp/file.tmp/): %s directory in %s on line %d
-- unlinking hard link /%s/unlinkVar8.tmp/file.tmp/ --
Warning: unlink(/%s/unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
@@ -203,4 +203,4 @@
file unlinked
-- unlinking hard link /%s//unlinkVar8.tmp//file.tmp --
file unlinked
-===DONE===
\ No newline at end of file
+===DONE===
Modified:
php/php-src/branches/PHP_5_3/ext/standard/tests/file/touch_variation5.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/touch_variation5.phpt
2009-08-10 06:19:41 UTC (rev 286987)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/touch_variation5.phpt
2009-08-10 06:53:49 UTC (rev 286988)
@@ -178,10 +178,10 @@
Warning: touch(): Unable to create file /%s/BADDIR/aSubDirOrFile because %s in
%s on line %d
--- testing touchVar5.tmp/aSubDirOrFile/ ---
-Warning: touch(): Unable to create file touchVar5.tmp/aSubDirOrFile/ because
Is a directory in %s on line %d
+Warning: touch(): Unable to create file touchVar5.tmp/aSubDirOrFile/ because
%s in %s on line %d
--- testing /%s/touchVar5.tmp/aSubDirOrFile/ ---
-Warning: touch(): Unable to create file /%s/touchVar5.tmp/aSubDirOrFile/
because Is a directory in %s on line %d
+Warning: touch(): Unable to create file /%s/touchVar5.tmp/aSubDirOrFile/
because %s in %s on line %d
--- testing touchVar5.tmp//aSubDirOrFile ---
PASSED: touchVar5.tmp//aSubDirOrFile - created
--- testing /%s//touchVar5.tmp//aSubDirOrFile ---
Modified:
php/php-src/branches/PHP_5_3/ext/standard/tests/file/unlink_variation8.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/unlink_variation8.phpt
2009-08-10 06:19:41 UTC (rev 286987)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/unlink_variation8.phpt
2009-08-10 06:53:49 UTC (rev 286988)
@@ -178,7 +178,7 @@
Warning: unlink(unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
-- unlinking soft link unlinkVar8.tmp/file.tmp/ --
-Warning: unlink(unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
+Warning: unlink(unlinkVar8.tmp/file.tmp/): %s directory in %s on line %d
-- unlinking hard link unlinkVar8.tmp/file.tmp/ --
Warning: unlink(unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
@@ -187,7 +187,7 @@
Warning: unlink(/%s/unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
-- unlinking soft link /%s/unlinkVar8.tmp/file.tmp/ --
-Warning: unlink(/%s/unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
+Warning: unlink(/%s/unlinkVar8.tmp/file.tmp/): %s directory in %s on line %d
-- unlinking hard link /%s/unlinkVar8.tmp/file.tmp/ --
Warning: unlink(/%s/unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
@@ -203,4 +203,4 @@
file unlinked
-- unlinking hard link /%s//unlinkVar8.tmp//file.tmp --
file unlinked
-===DONE===
\ No newline at end of file
+===DONE===
Modified: php/php-src/trunk/ext/standard/tests/file/touch_variation5.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/touch_variation5.phpt
2009-08-10 06:19:41 UTC (rev 286987)
+++ php/php-src/trunk/ext/standard/tests/file/touch_variation5.phpt
2009-08-10 06:53:49 UTC (rev 286988)
@@ -178,10 +178,10 @@
Warning: touch(): Unable to create file /%s/BADDIR/aSubDirOrFile because %s in
%s on line %d
--- testing touchVar5.tmp/aSubDirOrFile/ ---
-Warning: touch(): Unable to create file touchVar5.tmp/aSubDirOrFile/ because
Is a directory in %s on line %d
+Warning: touch(): Unable to create file touchVar5.tmp/aSubDirOrFile/ because
%s in %s on line %d
--- testing /%s/touchVar5.tmp/aSubDirOrFile/ ---
-Warning: touch(): Unable to create file /%s/touchVar5.tmp/aSubDirOrFile/
because Is a directory in %s on line %d
+Warning: touch(): Unable to create file /%s/touchVar5.tmp/aSubDirOrFile/
because %s in %s on line %d
--- testing touchVar5.tmp//aSubDirOrFile ---
PASSED: touchVar5.tmp//aSubDirOrFile - created
--- testing /%s//touchVar5.tmp//aSubDirOrFile ---
Modified: php/php-src/trunk/ext/standard/tests/file/unlink_variation8.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/unlink_variation8.phpt
2009-08-10 06:19:41 UTC (rev 286987)
+++ php/php-src/trunk/ext/standard/tests/file/unlink_variation8.phpt
2009-08-10 06:53:49 UTC (rev 286988)
@@ -178,7 +178,7 @@
Warning: unlink(unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
-- unlinking soft link unlinkVar8.tmp/file.tmp/ --
-Warning: unlink(unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
+Warning: unlink(unlinkVar8.tmp/file.tmp/): %s directory in %s on line %d
-- unlinking hard link unlinkVar8.tmp/file.tmp/ --
Warning: unlink(unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
@@ -187,7 +187,7 @@
Warning: unlink(/%s/unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
-- unlinking soft link /%s/unlinkVar8.tmp/file.tmp/ --
-Warning: unlink(/%s/unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
+Warning: unlink(/%s/unlinkVar8.tmp/file.tmp/): %s directory in %s on line %d
-- unlinking hard link /%s/unlinkVar8.tmp/file.tmp/ --
Warning: unlink(/%s/unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
@@ -203,4 +203,4 @@
file unlinked
-- unlinking hard link /%s//unlinkVar8.tmp//file.tmp --
file unlinked
-===DONE===
\ No newline at end of file
+===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
