pajoye Mon, 01 Feb 2010 15:18:55 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=294308
Log:
- fix system/version dependent msg, add skip cases, sync
Changed paths:
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/005_variation2-win32.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/chmod_variation3.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/fopen_variation10-win32.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/fopen_variation11-win32.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/fpassthru_basic.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/mkdir_variation1-win32.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation13-win32.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation3-win32.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/rmdir_variation1-win32.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/rmdir_variation1.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/tempnam_variation3-win32.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/tempnam_variation7-win32.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/unlink_error-win32.phpt
U php/php-src/trunk/ext/standard/tests/file/005_variation2-win32.phpt
U php/php-src/trunk/ext/standard/tests/file/chmod_variation3.phpt
U php/php-src/trunk/ext/standard/tests/file/fopen_variation10-win32.phpt
U php/php-src/trunk/ext/standard/tests/file/fopen_variation11-win32.phpt
U php/php-src/trunk/ext/standard/tests/file/fpassthru_basic.phpt
U php/php-src/trunk/ext/standard/tests/file/mkdir_variation1-win32.phpt
U php/php-src/trunk/ext/standard/tests/file/rename_variation13-win32.phpt
U php/php-src/trunk/ext/standard/tests/file/rename_variation3-win32.phpt
U php/php-src/trunk/ext/standard/tests/file/rmdir_variation1-win32.phpt
U php/php-src/trunk/ext/standard/tests/file/rmdir_variation1.phpt
U php/php-src/trunk/ext/standard/tests/file/tempnam_variation3-win32.phpt
U php/php-src/trunk/ext/standard/tests/file/tempnam_variation7-win32.phpt
U php/php-src/trunk/ext/standard/tests/file/unlink_error-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 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/005_variation2-win32.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -108,18 +108,18 @@
*** testing touch ***
-Warning: touch(): Unable to create file because %s in %s on line %d
+Warning: touch(): %s in %s on line %d
bool(false)
-Warning: touch(): Unable to create file because %s in %s on line %d
+Warning: touch(): %s in %s on line %d
bool(false)
-Warning: touch(): Unable to create file because %s in %s on line %d
+Warning: touch(): %s in %s on line %d
bool(false)
-Warning: touch(): Unable to create file because %s in %s on line %d
+Warning: touch(): %s in %s on line %d
bool(false)
-Warning: touch(): Unable to create file | because %s in %s on line %d
+Warning: touch(): %s in %s on line %d
bool(false)
Done
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/chmod_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/chmod_variation3.phpt 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/chmod_variation3.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -159,11 +159,11 @@
NULL
--uppercase NULL--
-Error: 2 - chmod(): No such file or directory, %s(%d)
+Error: 2 - chmod(): %s, %s(%d)
bool(false)
--lowercase null--
-Error: 2 - chmod(): No such file or directory, %s(%d)
+Error: 2 - chmod(): %s, %s(%d)
bool(false)
--lowercase true--
@@ -171,7 +171,7 @@
bool(false)
--lowercase false--
-Error: 2 - chmod(): No such file or directory, %s(%d)
+Error: 2 - chmod(): %s, %s(%d)
bool(false)
--uppercase TRUE--
@@ -179,15 +179,15 @@
bool(false)
--uppercase FALSE--
-Error: 2 - chmod(): No such file or directory, %s(%d)
+Error: 2 - chmod(): %s, %s(%d)
bool(false)
--empty string DQ--
-Error: 2 - chmod(): No such file or directory, %s(%d)
+Error: 2 - chmod(): %s, %s(%d)
bool(false)
--empty string SQ--
-Error: 2 - chmod(): No such file or directory, %s(%d)
+Error: 2 - chmod(): %s, %s(%d)
bool(false)
--instance of classWithToString--
@@ -199,11 +199,11 @@
NULL
--undefined var--
-Error: 2 - chmod(): No such file or directory, %s(%d)
+Error: 2 - chmod(): %s, %s(%d)
bool(false)
--unset var--
-Error: 2 - chmod(): No such file or directory, %s(%d)
+Error: 2 - chmod(): %s, %s(%d)
bool(false)
===DONE===
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/fopen_variation10-win32.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/fopen_variation10-win32.phpt 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/fopen_variation10-win32.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -6,6 +6,11 @@
<?php
if(substr(PHP_OS, 0, 3) != "WIN")
die("skip Run only on Windows");
+
+if (!is_writable('c:\\fopen_variation10.tmp')) {
+ die('skip. C:\\ not writable.');
+}
+
?>
--FILE--
<?php
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/fopen_variation11-win32.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/fopen_variation11-win32.phpt 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/fopen_variation11-win32.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -6,6 +6,10 @@
<?php
if(substr(PHP_OS, 0, 3) != "WIN")
die("skip Run only on Windows");
+if (!is_writable('c:\\fopen_variation10.tmp')) {
+ die('skip. C:\\ not writable.');
+}
+
?>
--FILE--
<?php
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/fpassthru_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/fpassthru_basic.phpt 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/fpassthru_basic.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -13,7 +13,9 @@
$string = "Hello, world\n, abcdefg\tadsdsfdf\n8u2394723947\t$%$%#$%#$%#^#%^
Hello, world\n, abcdefg\tadsdsfdf\n8u2394723947\t$%$%#$%#$%#^#%^\n";
-
+if(substr(PHP_OS, 0, 3) == "WIN") {
+ $string = str_replace("\r",'', $string);
+}
fwrite($write_handle, $string);
fclose($write_handle);
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/mkdir_variation1-win32.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/mkdir_variation1-win32.phpt 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/mkdir_variation1-win32.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -94,28 +94,28 @@
*** Testing mkdir() : usage variation ***
--uppercase NULL--
-Error: 2 - mkdir(): No such file or directory, %s(%d)
+Error: 2 - mkdir(): %s, %s(%d)
--lowercase null--
-Error: 2 - mkdir(): No such file or directory, %s(%d)
+Error: 2 - mkdir(): %s, %s(%d)
--lowercase false--
-Error: 2 - mkdir(): No such file or directory, %s(%d)
+Error: 2 - mkdir(): %s, %s(%d)
--uppercase FALSE--
-Error: 2 - mkdir(): No such file or directory, %s(%d)
+Error: 2 - mkdir(): %s, %s(%d)
--empty string DQ--
-Error: 2 - mkdir(): No such file or directory, %s(%d)
+Error: 2 - mkdir(): %s, %s(%d)
--empty string SQ--
-Error: 2 - mkdir(): No such file or directory, %s(%d)
+Error: 2 - mkdir(): %s, %s(%d)
--undefined var--
-Error: 2 - mkdir(): No such file or directory, %s(%d)
+Error: 2 - mkdir(): %s, %s(%d)
--unset var--
-Error: 2 - mkdir(): No such file or directory, %s(%d)
+Error: 2 - mkdir(): %s, %s(%d)
--single space--
Error: 2 - mkdir(): %s, %s(%d)
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation13-win32.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation13-win32.phpt 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation13-win32.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -51,15 +51,15 @@
touch($aFile);
var_dump(rename($aFile, $name));
if (file_exists($name)) {
- unlink($name);
+ @unlink($name);
}
if (file_exists($aFile)) {
- unlink($aFile);
+ @unlink($aFile);
}
var_dump(rename($name, $aFile));
if (file_exists($aFile)) {
- unlink($aFile);
+ @unlink($aFile);
}
}
@@ -80,24 +80,24 @@
bool(false)
-- 2 testing '' boolean --
-Warning: rename(%s/renameVar13/afile.tmp,): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d
+Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
bool(false)
-Warning: rename(,%s/renameVar13/afile.tmp): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d
+Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d
bool(false)
-- 3 testing '' NULL --
-Warning: rename(%s/renameVar13/afile.tmp,): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d
+Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
bool(false)
-Warning: rename(,%s/renameVar13/afile.tmp): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d
+Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d
bool(false)
-- 4 testing '' string --
-Warning: rename(%s/renameVar13/afile.tmp,): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d
+Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
bool(false)
-Warning: rename(,%s/renameVar13/afile.tmp): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d
+Warning: rename(,%s/renameVar13/afile.tmp):%s in %s on line %d
bool(false)
-- 5 testing ' ' string --
@@ -108,10 +108,10 @@
bool(false)
-- 6 testing ' ' string --
-Warning: rename(%s/renameVar13/afile.tmp,): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d
+Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
bool(false)
-Warning: rename(,%s/renameVar13/afile.tmp): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d
+Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d
bool(false)
-- 7 testing 'Array' array --
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation3-win32.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation3-win32.phpt 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation3-win32.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -24,6 +24,9 @@
$filename = "$file_path/rename_variation3.tmp";
$fp = fopen($filename, "w");
+if (!$fp) {
+ die("Cannot create $filename\n");
+}
fclose($fp);
echo "\n-- Renaming file to same file name --\n";
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/rmdir_variation1-win32.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/rmdir_variation1-win32.phpt 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/rmdir_variation1-win32.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -90,35 +90,35 @@
*** Testing rmdir() : usage variation ***
--uppercase NULL--
-Error: 2 - rmdir(): No such file or directory, %s(%d)
+Error: 2 - rmdir(): %s, %s(%d)
bool(false)
--lowercase null--
-Error: 2 - rmdir(): No such file or directory, %s(%d)
+Error: 2 - rmdir(): %s, %s(%d)
bool(false)
--lowercase false--
-Error: 2 - rmdir(): No such file or directory, %s(%d)
+Error: 2 - rmdir(): %s, %s(%d)
bool(false)
--uppercase FALSE--
-Error: 2 - rmdir(): No such file or directory, %s(%d)
+Error: 2 - rmdir(): %s, %s(%d)
bool(false)
--empty string DQ--
-Error: 2 - rmdir(): No such file or directory, %s(%d)
+Error: 2 - rmdir(): %s, %s(%d)
bool(false)
--empty string SQ--
-Error: 2 - rmdir(): No such file or directory, %s(%d)
+Error: 2 - rmdir(): %s, %s(%d)
bool(false)
--undefined var--
-Error: 2 - rmdir(): No such file or directory, %s(%d)
+Error: 2 - rmdir(): %s, %s(%d)
bool(false)
--unset var--
-Error: 2 - rmdir(): No such file or directory, %s(%d)
+Error: 2 - rmdir(): %s, %s(%d)
bool(false)
--single space--
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/rmdir_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/rmdir_variation1.phpt 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/rmdir_variation1.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -81,7 +81,7 @@
foreach($inputs as $key =>$value) {
echo "\n--$key--\n";
- var_dump( rmdir($value) );
+ var_dump(rmdir($value));
};
?>
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/tempnam_variation3-win32.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/tempnam_variation3-win32.phpt 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/tempnam_variation3-win32.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -3,7 +3,7 @@
--SKIPIF--
<?php
if(substr(PHP_OS, 0, 3) != "WIN")
- die("skip run only on Windows");
+ die("skip run only on Windows");
?>
--FILE--
<?php
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/tempnam_variation7-win32.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/tempnam_variation7-win32.phpt 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/tempnam_variation7-win32.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -97,7 +97,7 @@
Warning: tempnam() expects parameter 1 to be string, array given in %s on line %d
-- File is not created --
-Warning: unlink(): No such file or directory in %s on line %d
+Warning: unlink(): %s in %s on line %d
-- Iteration 8 --
File name is => %s%et%s
File permissions are => 100666
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/unlink_error-win32.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/unlink_error-win32.phpt 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/unlink_error-win32.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -77,15 +77,15 @@
-- Testing unlink() on invalid arguments --
-Warning: unlink(): No such file or directory in %s on line %d
+Warning: unlink(): %s in %s on line %d
bool(false)
bool(false)
-Warning: unlink(): No such file or directory in %s on line %d
+Warning: unlink(): %s in %s on line %d
bool(false)
bool(false)
-Warning: unlink(): No such file or directory in %s on line %d
+Warning: unlink(): %s in %s on line %d
bool(false)
bool(false)
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 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/trunk/ext/standard/tests/file/005_variation2-win32.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -108,18 +108,18 @@
*** testing touch ***
-Warning: touch(): Unable to create file because %s in %s on line %d
+Warning: touch(): %s in %s on line %d
bool(false)
-Warning: touch(): Unable to create file because %s in %s on line %d
+Warning: touch(): %s in %s on line %d
bool(false)
-Warning: touch(): Unable to create file because %s in %s on line %d
+Warning: touch(): %s in %s on line %d
bool(false)
-Warning: touch(): Unable to create file because %s in %s on line %d
+Warning: touch(): %s in %s on line %d
bool(false)
-Warning: touch(): Unable to create file | because %s in %s on line %d
+Warning: touch(): %s in %s on line %d
bool(false)
Done
Modified: php/php-src/trunk/ext/standard/tests/file/chmod_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/chmod_variation3.phpt 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/trunk/ext/standard/tests/file/chmod_variation3.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -159,11 +159,11 @@
NULL
--uppercase NULL--
-Error: 2 - chmod(): No such file or directory, %s(%d)
+Error: 2 - chmod(): %s, %s(%d)
bool(false)
--lowercase null--
-Error: 2 - chmod(): No such file or directory, %s(%d)
+Error: 2 - chmod(): %s, %s(%d)
bool(false)
--lowercase true--
@@ -171,7 +171,7 @@
bool(false)
--lowercase false--
-Error: 2 - chmod(): No such file or directory, %s(%d)
+Error: 2 - chmod(): %s, %s(%d)
bool(false)
--uppercase TRUE--
@@ -179,15 +179,15 @@
bool(false)
--uppercase FALSE--
-Error: 2 - chmod(): No such file or directory, %s(%d)
+Error: 2 - chmod(): %s, %s(%d)
bool(false)
--empty string DQ--
-Error: 2 - chmod(): No such file or directory, %s(%d)
+Error: 2 - chmod(): %s, %s(%d)
bool(false)
--empty string SQ--
-Error: 2 - chmod(): No such file or directory, %s(%d)
+Error: 2 - chmod(): %s, %s(%d)
bool(false)
--instance of classWithToString--
@@ -199,11 +199,11 @@
NULL
--undefined var--
-Error: 2 - chmod(): No such file or directory, %s(%d)
+Error: 2 - chmod(): %s, %s(%d)
bool(false)
--unset var--
-Error: 2 - chmod(): No such file or directory, %s(%d)
+Error: 2 - chmod(): %s, %s(%d)
bool(false)
===DONE===
Modified: php/php-src/trunk/ext/standard/tests/file/fopen_variation10-win32.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/fopen_variation10-win32.phpt 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/trunk/ext/standard/tests/file/fopen_variation10-win32.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -8,6 +8,11 @@
<?php
if(substr(PHP_OS, 0, 3) != "WIN")
die("skip Run only on Windows");
+
+if (!is_writable('c:\\fopen_variation10.tmp')) {
+ die('skip. C:\\ not writable.');
+}
+
?>
--FILE--
<?php
Modified: php/php-src/trunk/ext/standard/tests/file/fopen_variation11-win32.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/fopen_variation11-win32.phpt 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/trunk/ext/standard/tests/file/fopen_variation11-win32.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -8,6 +8,10 @@
<?php
if(substr(PHP_OS, 0, 3) != "WIN")
die("skip Run only on Windows");
+if (!is_writable('c:\\fopen_variation10.tmp')) {
+ die('skip. C:\\ not writable.');
+}
+
?>
--FILE--
<?php
Modified: php/php-src/trunk/ext/standard/tests/file/fpassthru_basic.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/fpassthru_basic.phpt 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/trunk/ext/standard/tests/file/fpassthru_basic.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -13,7 +13,9 @@
$string = "Hello, world\n, abcdefg\tadsdsfdf\n8u2394723947\t$%$%#$%#$%#^#%^
Hello, world\n, abcdefg\tadsdsfdf\n8u2394723947\t$%$%#$%#$%#^#%^\n";
-
+if(substr(PHP_OS, 0, 3) == "WIN") {
+ $string = str_replace("\r",'', $string);
+}
fwrite($write_handle, $string);
fclose($write_handle);
Modified: php/php-src/trunk/ext/standard/tests/file/mkdir_variation1-win32.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/mkdir_variation1-win32.phpt 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/trunk/ext/standard/tests/file/mkdir_variation1-win32.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -94,28 +94,28 @@
*** Testing mkdir() : usage variation ***
--uppercase NULL--
-Error: 2 - mkdir(): No such file or directory, %s(%d)
+Error: 2 - mkdir(): %s, %s(%d)
--lowercase null--
-Error: 2 - mkdir(): No such file or directory, %s(%d)
+Error: 2 - mkdir(): %s, %s(%d)
--lowercase false--
-Error: 2 - mkdir(): No such file or directory, %s(%d)
+Error: 2 - mkdir(): %s, %s(%d)
--uppercase FALSE--
-Error: 2 - mkdir(): No such file or directory, %s(%d)
+Error: 2 - mkdir(): %s, %s(%d)
--empty string DQ--
-Error: 2 - mkdir(): No such file or directory, %s(%d)
+Error: 2 - mkdir(): %s, %s(%d)
--empty string SQ--
-Error: 2 - mkdir(): No such file or directory, %s(%d)
+Error: 2 - mkdir(): %s, %s(%d)
--undefined var--
-Error: 2 - mkdir(): No such file or directory, %s(%d)
+Error: 2 - mkdir(): %s, %s(%d)
--unset var--
-Error: 2 - mkdir(): No such file or directory, %s(%d)
+Error: 2 - mkdir(): %s, %s(%d)
--single space--
Error: 2 - mkdir(): %s, %s(%d)
Modified: php/php-src/trunk/ext/standard/tests/file/rename_variation13-win32.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/rename_variation13-win32.phpt 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/trunk/ext/standard/tests/file/rename_variation13-win32.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -51,15 +51,15 @@
touch($aFile);
var_dump(rename($aFile, $name));
if (file_exists($name)) {
- unlink($name);
+ @unlink($name);
}
if (file_exists($aFile)) {
- unlink($aFile);
+ @unlink($aFile);
}
var_dump(rename($name, $aFile));
if (file_exists($aFile)) {
- unlink($aFile);
+ @unlink($aFile);
}
}
@@ -80,24 +80,24 @@
bool(false)
-- 2 testing '' boolean --
-Warning: rename(%s/renameVar13/afile.tmp,): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d
+Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
bool(false)
-Warning: rename(,%s/renameVar13/afile.tmp): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d
+Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d
bool(false)
-- 3 testing '' NULL --
-Warning: rename(%s/renameVar13/afile.tmp,): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d
+Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
bool(false)
-Warning: rename(,%s/renameVar13/afile.tmp): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d
+Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d
bool(false)
-- 4 testing '' string --
-Warning: rename(%s/renameVar13/afile.tmp,): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d
+Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
bool(false)
-Warning: rename(,%s/renameVar13/afile.tmp): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d
+Warning: rename(,%s/renameVar13/afile.tmp):%s in %s on line %d
bool(false)
-- 5 testing ' ' string --
@@ -107,10 +107,10 @@
Warning: rename( ,%s/renameVar13/afile.tmp): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d
bool(false)
-- 6 testing '
-Warning: rename(%s/renameVar13/afile.tmp,): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d
+Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
bool(false)
-Warning: rename(,%s/renameVar13/afile.tmp): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d
+Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d
bool(false)
-- 7 testing 'Array' array --
Modified: php/php-src/trunk/ext/standard/tests/file/rename_variation3-win32.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/rename_variation3-win32.phpt 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/trunk/ext/standard/tests/file/rename_variation3-win32.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -24,6 +24,9 @@
$filename = "$file_path/rename_variation3.tmp";
$fp = fopen($filename, "w");
+if (!$fp) {
+ die("Cannot create $filename\n");
+}
fclose($fp);
echo "\n-- Renaming file to same file name --\n";
Modified: php/php-src/trunk/ext/standard/tests/file/rmdir_variation1-win32.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/rmdir_variation1-win32.phpt 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/trunk/ext/standard/tests/file/rmdir_variation1-win32.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -90,35 +90,35 @@
*** Testing rmdir() : usage variation ***
--uppercase NULL--
-Error: 2 - rmdir(): No such file or directory, %s(%d)
+Error: 2 - rmdir(): %s, %s(%d)
bool(false)
--lowercase null--
-Error: 2 - rmdir(): No such file or directory, %s(%d)
+Error: 2 - rmdir(): %s, %s(%d)
bool(false)
--lowercase false--
-Error: 2 - rmdir(): No such file or directory, %s(%d)
+Error: 2 - rmdir(): %s, %s(%d)
bool(false)
--uppercase FALSE--
-Error: 2 - rmdir(): No such file or directory, %s(%d)
+Error: 2 - rmdir(): %s, %s(%d)
bool(false)
--empty string DQ--
-Error: 2 - rmdir(): No such file or directory, %s(%d)
+Error: 2 - rmdir(): %s, %s(%d)
bool(false)
--empty string SQ--
-Error: 2 - rmdir(): No such file or directory, %s(%d)
+Error: 2 - rmdir(): %s, %s(%d)
bool(false)
--undefined var--
-Error: 2 - rmdir(): No such file or directory, %s(%d)
+Error: 2 - rmdir(): %s, %s(%d)
bool(false)
--unset var--
-Error: 2 - rmdir(): No such file or directory, %s(%d)
+Error: 2 - rmdir(): %s, %s(%d)
bool(false)
--single space--
Modified: php/php-src/trunk/ext/standard/tests/file/rmdir_variation1.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/rmdir_variation1.phpt 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/trunk/ext/standard/tests/file/rmdir_variation1.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -81,7 +81,7 @@
foreach($inputs as $key =>$value) {
echo "\n--$key--\n";
- var_dump( rmdir($value) );
+ var_dump(rmdir($value));
};
?>
Modified: php/php-src/trunk/ext/standard/tests/file/tempnam_variation3-win32.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/tempnam_variation3-win32.phpt 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/trunk/ext/standard/tests/file/tempnam_variation3-win32.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -3,7 +3,7 @@
--SKIPIF--
<?php
if(substr(PHP_OS, 0, 3) != "WIN")
- die("skip run only on Windows");
+ die("skip run only on Windows");
?>
--FILE--
<?php
Modified: php/php-src/trunk/ext/standard/tests/file/tempnam_variation7-win32.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/tempnam_variation7-win32.phpt 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/trunk/ext/standard/tests/file/tempnam_variation7-win32.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -95,9 +95,9 @@
-- Iteration 7 --
Notice: Array to string conversion in %s on line %d
-File name is => %s%et%s
-File permissions are => 100666
-File created in => temp dir
+-- File is not created --
+
+Warning: unlink(): %s in %s on line %d
-- Iteration 8 --
File name is => %s%et%s
File permissions are => 100666
Modified: php/php-src/trunk/ext/standard/tests/file/unlink_error-win32.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/unlink_error-win32.phpt 2010-02-01 14:56:51 UTC (rev 294307)
+++ php/php-src/trunk/ext/standard/tests/file/unlink_error-win32.phpt 2010-02-01 15:18:55 UTC (rev 294308)
@@ -77,15 +77,15 @@
-- Testing unlink() on invalid arguments --
-Warning: unlink(): No such file or directory in %s on line %d
+Warning: unlink(): %s in %s on line %d
bool(false)
bool(false)
-Warning: unlink(): No such file or directory in %s on line %d
+Warning: unlink(): %s in %s on line %d
bool(false)
bool(false)
-Warning: unlink(): No such file or directory in %s on line %d
+Warning: unlink(): %s in %s on line %d
bool(false)
bool(false)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
