From: Dmitry Stogov <dmitry@php.net>
Date: Mon, 24 Mar 2008 09:00:41 +0000 (+0000)
Subject: Fixed tests (file order is undefined, so we need to sort() them)
X-Git-Tag: RELEASE_2_0_0a1~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=824fa7ad54f3d4c2a01d4aaff287e135952eaebc;p=php

Fixed tests (file order is undefined, so we need to sort() them)
---

diff --git a/ext/standard/tests/dir/readdir_basic.phpt b/ext/standard/tests/dir/readdir_basic.phpt
index c6ea2007dc..f941235c4d 100644
--- a/ext/standard/tests/dir/readdir_basic.phpt
+++ b/ext/standard/tests/dir/readdir_basic.phpt
@@ -22,13 +22,23 @@ mkdir($path);
 
 echo "\n-- Call readdir() with \$path argument --\n";
 var_dump($dh = opendir($path));
+$a = array();
 while( FALSE !== ($file = readdir($dh)) ) {
+	$a[] = $file;
+}
+sort($a);
+foreach($a as $file) {
 	var_dump($file);
 }
 
 echo "\n-- Call readdir() without \$path argument --\n";
 var_dump($dh = opendir($path));
+$a = array();
 while( FALSE !== ( $file = readdir() ) ) {
+	$a[] = $file;
+}
+sort($a);
+foreach($a as $file) {
 	var_dump($file);
 }
 
diff --git a/ext/standard/tests/dir/readdir_variation6.phpt b/ext/standard/tests/dir/readdir_variation6.phpt
index 3e70fb1479..6051bf73e2 100644
--- a/ext/standard/tests/dir/readdir_variation6.phpt
+++ b/ext/standard/tests/dir/readdir_variation6.phpt
@@ -14,15 +14,15 @@ Test readdir() function : usage variations - operate on previously opened direct
 
 echo "*** Testing readdir() : usage variations ***\n";
 
-
-include( dirname(__FILE__) . "/../file/file.inc");
+// include the file.inc for Function: function create_files()
+include( dirname(__FILE__)."/../file/file.inc");
 
 // create the temporary directory
 $dir_path = dirname(__FILE__) . "/readdir_variation6";
 mkdir($dir_path);
 
 // create files within the temporary directory
-@create_files($dir_path, 3, "alphanumeric", 0755, 1, "w", "readdir_variation6");
+create_files($dir_path, 3, "alphanumeric", 0755, 1, "w", "readdir_variation6");
 
 // open the directory
 $dir_handle1 = opendir($dir_path);
@@ -31,12 +31,22 @@ $dir_handle1 = opendir($dir_path);
 opendir($dir_path);
 
 echo "\n-- Reading Directory Contents with Previous Handle --\n";
+$a = array();
 while (FALSE !== ($file = readdir($dir_handle1))) {
+	$a[] = $file;
+}
+sort($a);
+foreach ($a as $file) {
 	var_dump($file);
 }
 
 echo "\n-- Reading Directory Contents with Current Handle (no arguments supplied) --\n";
+$a = array();
 while (FALSE !== ($file = readdir())) {
+	$a[] = $file;
+}
+sort($a);
+foreach ($a as $file) {
 	var_dump($file);
 }