kraghuba Mon Dec 24 04:26:41 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings sprintf_variation5.phpt
sprintf_variation48.phpt
Log:
fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/sprintf_variation5.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/strings/sprintf_variation5.phpt
diff -u php-src/ext/standard/tests/strings/sprintf_variation5.phpt:1.1.2.1
php-src/ext/standard/tests/strings/sprintf_variation5.phpt:1.1.2.2
--- php-src/ext/standard/tests/strings/sprintf_variation5.phpt:1.1.2.1 Sat Sep
29 14:13:53 2007
+++ php-src/ext/standard/tests/strings/sprintf_variation5.phpt Mon Dec 24
04:26:41 2007
@@ -12,11 +12,14 @@
// resource type variable
$fp = fopen (__FILE__, "r");
$dfp = opendir ( dirname(__FILE__) );
+
+$fp_copy = $fp;
+$dfp_copy = $dfp;
// array of resource types
$resource_types = array (
- $fp,
- $dfp
+ $fp_copy,
+ $dfp_copy
);
// various integer formats
@@ -38,7 +41,7 @@
// closing the resources
fclose($fp);
-fclose($dfp);
+closedir($dfp);
echo "Done";
@@ -53,8 +56,8 @@
string(%d) " %d"
string(%d) "
%d"
-string(%d) " %d"
-string(4) "0-9]"
+string(%d) "%s%d"
+string(%d) "0-9]"
string(1) "d"
-- Iteration 2 --
@@ -64,7 +67,7 @@
string(%d) " %d"
string(%d) "
%d"
-string(%d) " %d"
-string(4) "0-9]"
+string(%d) "%s%d"
+string(%d) "0-9]"
string(1) "d"
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/sprintf_variation48.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/strings/sprintf_variation48.phpt
diff -u php-src/ext/standard/tests/strings/sprintf_variation48.phpt:1.1.2.1
php-src/ext/standard/tests/strings/sprintf_variation48.phpt:1.1.2.2
--- php-src/ext/standard/tests/strings/sprintf_variation48.phpt:1.1.2.1 Sat Sep
29 14:13:53 2007
+++ php-src/ext/standard/tests/strings/sprintf_variation48.phpt Mon Dec 24
04:26:41 2007
@@ -39,7 +39,7 @@
// closing the resources
fclose($fp);
-fclose($dfp);
+closedir($dfp);
echo "Done";
@@ -48,32 +48,32 @@
*** Testing sprintf() : scientific formats with resource values ***
-- Iteration 1 --
-string(%d) "%d.000000e+0"
+string(%d) "%f"
string(1) "e"
-string(%d) "%d.000000e+0"
+string(%d) "%f"
string(1) "e"
-string(%d) " %d.000000e+0"
-string(%d) "%d.000000e+0 "
-string(%d) " %d.000000e+0"
+string(%d) " %f"
+string(%d) "%f "
+string(%d) " %f"
string(%d) "
-%d.000000e+0"
-string(%d) "%d.000000e+0"
-string(%d) " %d.000000e+0"
-string(4) "0-1]"
+%f"
+string(%d) "%f"
+string(%d) "%s%f"
+string(%d) "0-1]"
string(1) "e"
-- Iteration 2 --
-string(%d) "%d.000000e+0"
+string(%d) "%f"
string(1) "e"
-string(%d) "%d.000000e+0"
+string(%d) "%f"
string(1) "e"
-string(%d) " %d.000000e+0"
-string(%d) "%d.000000e+0 "
-string(%d) " %d.000000e+0"
+string(%d) " %f"
+string(%d) "%f "
+string(%d) " %f"
string(%d) "
-%d.000000e+0"
-string(%d) "%d.000000e+0"
-string(%d) " %d.000000e+0"
-string(4) "0-1]"
+%f"
+string(%d) "%f"
+string(%d) "%s%f"
+string(%d) "0-1]"
string(1) "e"
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
