rasmus Sat, 12 Nov 2011 18:46:04 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=319108
Log:
Fix typo and don't use 'a' as an invalid filename since it is the default
gcc binary filename and is thus not unlikely to be left lying around in the
build dir which cause these tests to fail
Changed paths:
U php/php-src/branches/PHP_5_4/ext/standard/tests/strings/md5_file.phpt
U php/php-src/branches/PHP_5_4/ext/standard/tests/strings/sha1_file.phpt
U php/php-src/trunk/ext/standard/tests/strings/md5_file.phpt
U php/php-src/trunk/ext/standard/tests/strings/sha1_file.phpt
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/strings/md5_file.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/strings/md5_file.phpt
2011-11-12 18:39:15 UTC (rev 319107)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/strings/md5_file.phpt
2011-11-12 18:46:04 UTC (rev 319108)
@@ -30,13 +30,13 @@
fclose($handle2);
/* Testing error conditions */
-echo "\n*** Testing foe error conditions ***\n";
+echo "\n*** Testing for error conditions ***\n";
/* No filename */
var_dump( md5_file("") );
/* invalid filename */
-var_dump( md5_file("a") );
+var_dump( md5_file("aZrq16u") );
/* Scalar value as filename */
var_dump( md5_file(12) );
@@ -73,12 +73,12 @@
echo "\nDone";
?>
--EXPECTF--
-*** Testing foe error conditions ***
+*** Testing for error conditions ***
Warning: md5_file(): Filename cannot be empty in %s on line %d
bool(false)
-Warning: md5_file(a): failed to open stream: No such file or directory in %s
on line %d
+Warning: md5_file(aZrq16u): failed to open stream: No such file or directory
in %s on line %d
bool(false)
Warning: md5_file(12): failed to open stream: No such file or directory in %s
on line %d
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/strings/sha1_file.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/strings/sha1_file.phpt
2011-11-12 18:39:15 UTC (rev 319107)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/strings/sha1_file.phpt
2011-11-12 18:46:04 UTC (rev 319108)
@@ -38,7 +38,7 @@
var_dump( sha1_file("") );
echo "\n-- invalid filename --\n";
-var_dump( sha1_file("a") );
+var_dump( sha1_file("rewncwYcn89q") );
echo "\n-- Scalar value as filename --\n";
var_dump( sha1_file(12) );
@@ -82,7 +82,7 @@
-- invalid filename --
-Warning: sha1_file(a): failed to open stream: No such file or directory in %s
on line %d
+Warning: sha1_file(rewncwYcn89q): failed to open stream: No such file or
directory in %s on line %d
bool(false)
-- Scalar value as filename --
Modified: php/php-src/trunk/ext/standard/tests/strings/md5_file.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/md5_file.phpt 2011-11-12
18:39:15 UTC (rev 319107)
+++ php/php-src/trunk/ext/standard/tests/strings/md5_file.phpt 2011-11-12
18:46:04 UTC (rev 319108)
@@ -30,13 +30,13 @@
fclose($handle2);
/* Testing error conditions */
-echo "\n*** Testing foe error conditions ***\n";
+echo "\n*** Testing for error conditions ***\n";
/* No filename */
var_dump( md5_file("") );
/* invalid filename */
-var_dump( md5_file("a") );
+var_dump( md5_file("aZrq16u") );
/* Scalar value as filename */
var_dump( md5_file(12) );
@@ -73,12 +73,12 @@
echo "\nDone";
?>
--EXPECTF--
-*** Testing foe error conditions ***
+*** Testing for error conditions ***
Warning: md5_file(): Filename cannot be empty in %s on line %d
bool(false)
-Warning: md5_file(a): failed to open stream: No such file or directory in %s
on line %d
+Warning: md5_file(aZrq16u): failed to open stream: No such file or directory
in %s on line %d
bool(false)
Warning: md5_file(12): failed to open stream: No such file or directory in %s
on line %d
Modified: php/php-src/trunk/ext/standard/tests/strings/sha1_file.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/sha1_file.phpt 2011-11-12
18:39:15 UTC (rev 319107)
+++ php/php-src/trunk/ext/standard/tests/strings/sha1_file.phpt 2011-11-12
18:46:04 UTC (rev 319108)
@@ -38,7 +38,7 @@
var_dump( sha1_file("") );
echo "\n-- invalid filename --\n";
-var_dump( sha1_file("a") );
+var_dump( sha1_file("rewncwYcn89q") );
echo "\n-- Scalar value as filename --\n";
var_dump( sha1_file(12) );
@@ -82,7 +82,7 @@
-- invalid filename --
-Warning: sha1_file(a): failed to open stream: No such file or directory in %s
on line %d
+Warning: sha1_file(rewncwYcn89q): failed to open stream: No such file or
directory in %s on line %d
bool(false)
-- Scalar value as filename --
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
