From ba61a7fde527824bd7427f63ebced1b7c61c0f35 Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Mon, 1 Feb 2010 15:18:55 +0000 Subject: [PATCH] - fix system/version dependent msg, add skip cases, sync --- .../tests/file/005_variation2-win32.phpt | 10 ++++----- ext/standard/tests/file/chmod_variation3.phpt | 16 +++++++------- .../tests/file/fopen_variation10-win32.phpt | 5 +++++ .../tests/file/fopen_variation11-win32.phpt | 4 ++++ ext/standard/tests/file/fpassthru_basic.phpt | 4 +++- .../tests/file/mkdir_variation1-win32.phpt | 16 +++++++------- .../tests/file/rename_variation13-win32.phpt | 22 +++++++++---------- .../tests/file/rename_variation3-win32.phpt | 3 +++ .../tests/file/rmdir_variation1-win32.phpt | 16 +++++++------- ext/standard/tests/file/rmdir_variation1.phpt | 2 +- .../tests/file/tempnam_variation3-win32.phpt | 2 +- .../tests/file/tempnam_variation7-win32.phpt | 6 ++--- .../tests/file/unlink_error-win32.phpt | 6 ++--- 13 files changed, 63 insertions(+), 49 deletions(-) diff --git a/ext/standard/tests/file/005_variation2-win32.phpt b/ext/standard/tests/file/005_variation2-win32.phpt index 513182ddeb..45dcbc5f07 100644 --- a/ext/standard/tests/file/005_variation2-win32.phpt +++ b/ext/standard/tests/file/005_variation2-win32.phpt @@ -108,18 +108,18 @@ Warning: filectime(): stat failed for | in %s on line %d *** 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 diff --git a/ext/standard/tests/file/chmod_variation3.phpt b/ext/standard/tests/file/chmod_variation3.phpt index 37a02368a0..8b798efaa4 100644 --- a/ext/standard/tests/file/chmod_variation3.phpt +++ b/ext/standard/tests/file/chmod_variation3.phpt @@ -159,11 +159,11 @@ Error: 2 - chmod() expects parameter 1 to be string (Unicode or binary), array g 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 @@ Error: 2 - chmod(): No such file or directory, %s(%d) 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 @@ Error: 2 - chmod(): No such file or directory, %s(%d) 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 @@ Error: 2 - chmod() expects parameter 1 to be string (Unicode or binary), object 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=== diff --git a/ext/standard/tests/file/fopen_variation10-win32.phpt b/ext/standard/tests/file/fopen_variation10-win32.phpt index 2ad817c4fb..e4a1745d8b 100644 --- a/ext/standard/tests/file/fopen_variation10-win32.phpt +++ b/ext/standard/tests/file/fopen_variation10-win32.phpt @@ -8,6 +8,11 @@ Dave Kelsey --FILE-- --FILE-- $value) { *** 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) diff --git a/ext/standard/tests/file/rename_variation13-win32.phpt b/ext/standard/tests/file/rename_variation13-win32.phpt index dd9431f829..66d9f61498 100644 --- a/ext/standard/tests/file/rename_variation13-win32.phpt +++ b/ext/standard/tests/file/rename_variation13-win32.phpt @@ -51,15 +51,15 @@ for( $i=0; $i < count($names_arr); $i++ ) { 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 @@ Warning: rename(1,%s/renameVar13/afile.tmp): The system cannot find the file spe 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 @@ 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 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 -- diff --git a/ext/standard/tests/file/rename_variation3-win32.phpt b/ext/standard/tests/file/rename_variation3-win32.phpt index 209635af32..b5da587811 100644 --- a/ext/standard/tests/file/rename_variation3-win32.phpt +++ b/ext/standard/tests/file/rename_variation3-win32.phpt @@ -24,6 +24,9 @@ mkdir($dirname); $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"; diff --git a/ext/standard/tests/file/rmdir_variation1-win32.phpt b/ext/standard/tests/file/rmdir_variation1-win32.phpt index 0732821c54..2516e6162e 100644 --- a/ext/standard/tests/file/rmdir_variation1-win32.phpt +++ b/ext/standard/tests/file/rmdir_variation1-win32.phpt @@ -90,35 +90,35 @@ foreach($inputs as $key =>$value) { *** 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-- diff --git a/ext/standard/tests/file/rmdir_variation1.phpt b/ext/standard/tests/file/rmdir_variation1.phpt index a7a4990072..04fee0ee2a 100644 --- a/ext/standard/tests/file/rmdir_variation1.phpt +++ b/ext/standard/tests/file/rmdir_variation1.phpt @@ -81,7 +81,7 @@ $inputs = array( foreach($inputs as $key =>$value) { echo "\n--$key--\n"; - var_dump( rmdir($value) ); + var_dump(rmdir($value)); }; ?> diff --git a/ext/standard/tests/file/tempnam_variation3-win32.phpt b/ext/standard/tests/file/tempnam_variation3-win32.phpt index 00f5e1c0e9..2530736ce6 100644 --- a/ext/standard/tests/file/tempnam_variation3-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation3-win32.phpt @@ -3,7 +3,7 @@ Test tempnam() function: usage variations - obscure prefixes --SKIPIF-- --FILE-- temp dir -- 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 diff --git a/ext/standard/tests/file/unlink_error-win32.phpt b/ext/standard/tests/file/unlink_error-win32.phpt index 5eb40d02dd..1fb5cf2e9f 100644 --- a/ext/standard/tests/file/unlink_error-win32.phpt +++ b/ext/standard/tests/file/unlink_error-win32.phpt @@ -77,15 +77,15 @@ bool(true) -- 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) -- 2.40.0