[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/dir rewinddir_basic.phpt

2008-07-20 Thread Dmitry Stogov 
dmitry  Sun Jul 20 16:20:03 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard/tests/dir rewinddir_basic.phpt 
  Log:
  Fixed test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/rewinddir_basic.phpt?r1=1.1.4.3r2=1.1.4.4diff_format=u
Index: php-src/ext/standard/tests/dir/rewinddir_basic.phpt
diff -u php-src/ext/standard/tests/dir/rewinddir_basic.phpt:1.1.4.3 
php-src/ext/standard/tests/dir/rewinddir_basic.phpt:1.1.4.4
--- php-src/ext/standard/tests/dir/rewinddir_basic.phpt:1.1.4.3 Mon Mar 24 
18:33:54 2008
+++ php-src/ext/standard/tests/dir/rewinddir_basic.phpt Sun Jul 20 16:20:02 2008
@@ -32,22 +32,24 @@
 while(FALSE !== $file1 = readdir($dh1)) {
$data[] = $file1;
 }
+$first = $data[0];
 sort($data);
 var_dump($data);
 
 var_dump(rewinddir($dh1));
-var_dump(readdir($dh1));
+var_dump(readdir($dh1) == $first);
 
 $data = array();
 echo \n-- Read and rewind second directory (no argument supplied) --\n;
 while(FALSE !== $file2 = readdir()) {
$data[] = $file2;
 }
+$first = $data[0];
 sort($data);
 var_dump($data);
 
 var_dump(rewinddir());
-var_dump(readdir());
+var_dump(readdir() == $first);
 
 closedir($dh1);
 closedir($dh2);
@@ -78,7 +80,7 @@
   string(9) file1.tmp
 }
 NULL
-string(1) .
+bool(true)
 
 -- Read and rewind second directory (no argument supplied) --
 array(3) {
@@ -90,5 +92,5 @@
   string(9) file2.tmp
 }
 NULL
-string(1) .
+bool(true)
 ===DONE===



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/dir rewinddir_basic.phpt

2008-03-24 Thread Ilia Alshanetsky 
iliaa   Mon Mar 24 18:33:54 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard/tests/dir rewinddir_basic.phpt 
  Log:
  Fixed test on systems where . and .. order not guaranteed
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/rewinddir_basic.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u
Index: php-src/ext/standard/tests/dir/rewinddir_basic.phpt
diff -u php-src/ext/standard/tests/dir/rewinddir_basic.phpt:1.1.4.2 
php-src/ext/standard/tests/dir/rewinddir_basic.phpt:1.1.4.3
--- php-src/ext/standard/tests/dir/rewinddir_basic.phpt:1.1.4.2 Fri Mar  7 
16:12:03 2008
+++ php-src/ext/standard/tests/dir/rewinddir_basic.phpt Mon Mar 24 18:33:54 2008
@@ -27,18 +27,24 @@
 var_dump($dh1 = opendir($dir_path1));
 var_dump($dh2 = opendir($dir_path2));
 
+$data = array();
 echo \n-- Read and rewind first directory (argument supplied) --\n;
 while(FALSE !== $file1 = readdir($dh1)) {
-   var_dump($file1);
+   $data[] = $file1;
 }
+sort($data);
+var_dump($data);
 
 var_dump(rewinddir($dh1));
 var_dump(readdir($dh1));
 
+$data = array();
 echo \n-- Read and rewind second directory (no argument supplied) --\n;
 while(FALSE !== $file2 = readdir()) {
-   var_dump($file2);
+   $data[] = $file2;
 }
+sort($data);
+var_dump($data);
 
 var_dump(rewinddir());
 var_dump(readdir());
@@ -63,16 +69,26 @@
 resource(%d) of type (stream)
 
 -- Read and rewind first directory (argument supplied) --
-string(1) .
-string(2) ..
-string(9) file1.tmp
+array(3) {
+  [0]=
+  string(1) .
+  [1]=
+  string(2) ..
+  [2]=
+  string(9) file1.tmp
+}
 NULL
 string(1) .
 
 -- Read and rewind second directory (no argument supplied) --
-string(1) .
-string(2) ..
-string(9) file2.tmp
+array(3) {
+  [0]=
+  string(1) .
+  [1]=
+  string(2) ..
+  [2]=
+  string(9) file2.tmp
+}
 NULL
 string(1) .
 ===DONE===



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/dir rewinddir_basic.phpt rewinddir_error.phpt rewinddir_variation1.phpt rewinddir_variation2.phpt

2008-03-07 Thread Josie Messa 
jmessa  Fri Mar  7 16:12:03 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/dir rewinddir_variation1.phpt 
rewinddir_error.phpt 
rewinddir_basic.phpt 
rewinddir_variation2.phpt 
  Log:
  - New tests for rewinddir() function
  

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/rewinddir_variation1.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/dir/rewinddir_variation1.phpt
+++ php-src/ext/standard/tests/dir/rewinddir_variation1.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/rewinddir_error.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/dir/rewinddir_error.phpt
+++ php-src/ext/standard/tests/dir/rewinddir_error.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/rewinddir_basic.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/dir/rewinddir_basic.phpt
+++ php-src/ext/standard/tests/dir/rewinddir_basic.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/rewinddir_variation2.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/dir/rewinddir_variation2.phpt
+++ php-src/ext/standard/tests/dir/rewinddir_variation2.phpt



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php