com php-src: All tests passed in ext/standard/tests/dir now: ext/standard/tests/dir/closedir_variation2.phpt ext/sta ndard/tests/dir/dir_basic.phpt
ext/standard/tests/dir/rew inddir_variation2.phpt
| From: | Dmitry Stogov | Date: | Sun, 09 Mar 2014 12:10:02 +0000 |
| Subject: | com php-src: All tests passed in ext/standard/tests/dir now: ext/standard/tests/dir/closedir_variation2.phpt ext/sta ndard/tests/dir/dir_basic.phpt ext/standard/tests/dir/rew inddir_variation2.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77662@lists.php.net to get a copy of this message | ||
Commit: 43eaced19f4d1fc0e5010221c386af47228c1ecc
Author: Xinchen Hui <laruence@gmail.com> Sun, 9 Mar 2014 20:10:02 +0800
Parents: 2465f5c6d9bfc9df9b35fcf30a089f2f0daf69c3
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=43eaced19f4d1fc0e5010221c386af47228c1ecc
Log:
All tests passed in ext/standard/tests/dir now
Changed paths:
M ext/standard/tests/dir/closedir_variation2.phpt
M ext/standard/tests/dir/dir_basic.phpt
M ext/standard/tests/dir/rewinddir_variation2.phpt
Diff:
diff --git a/ext/standard/tests/dir/closedir_variation2.phpt
b/ext/standard/tests/dir/closedir_variation2.phpt
index 015176c..2437868 100644
--- a/ext/standard/tests/dir/closedir_variation2.phpt
+++ b/ext/standard/tests/dir/closedir_variation2.phpt
@@ -45,7 +45,7 @@ Directory Handle: resource(%d) of type (Unknown)
-- Close directory handle second time: --
-Warning: closedir(): %d is not a valid Directory resource in %s on line %d
+Warning: closedir(): supplied resource is not a valid Directory resource in %s on line %d
bool(false)
Directory Handle: resource(%d) of type (Unknown)
===DONE===
diff --git a/ext/standard/tests/dir/dir_basic.phpt b/ext/standard/tests/dir/dir_basic.phpt
index dba49db..da364b9 100644
--- a/ext/standard/tests/dir/dir_basic.phpt
+++ b/ext/standard/tests/dir/dir_basic.phpt
@@ -81,6 +81,6 @@ object(Directory)#%d (2) {
}
Test read after closing the dir:
-Warning: Directory::read(): %d is not a valid Directory resource in %s on line %d
+Warning: Directory::read(): supplied resource is not a valid Directory resource in %s on line %d
bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/dir/rewinddir_variation2.phpt
b/ext/standard/tests/dir/rewinddir_variation2.phpt
index 7594cc2..6b06a56 100644
--- a/ext/standard/tests/dir/rewinddir_variation2.phpt
+++ b/ext/standard/tests/dir/rewinddir_variation2.phpt
@@ -40,6 +40,6 @@ string(%d) "%s"
-- Call to rewinddir() --
-Warning: rewinddir(): %d is not a valid Directory resource in %s on line %d
+Warning: rewinddir(): supplied resource is not a valid Directory resource in %s on line %d
bool(false)
===DONE===