From: Arnaud Le Blanc <lbarnaud@php.net>
Date: Mon, 18 Aug 2008 04:45:25 +0000 (+0000)
Subject: Fix tests (closes #45841)
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~670
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=70f66898a499a52e71ac2edc7dbbeff4ad637aee;p=php

Fix tests (closes #45841)
---

diff --git a/ext/standard/tests/dir/readdir_variation2.phpt b/ext/standard/tests/dir/readdir_variation2.phpt
index 84742984b1..a1318e5975 100644
--- a/ext/standard/tests/dir/readdir_variation2.phpt
+++ b/ext/standard/tests/dir/readdir_variation2.phpt
@@ -18,11 +18,20 @@ mkdir($path);
 $dir_handle = opendir($path);
 
 echo "\n-- Pass an empty directory to readdir() --\n";
+function mysort($a,$b) {
+	return strlen($a) > strlen($b) ? 1 : -1;
+}
+$entries = array();
 while(FALSE !== ($file = readdir($dir_handle))){
-	var_dump($file);
+	$entries[] = $file;
 }
 
 closedir($dir_handle);
+
+usort($entries, "mysort");
+foreach($entries as $entry) {
+	var_dump($entry);
+}
 ?>
 ===DONE===
 --CLEAN--
diff --git a/ext/standard/tests/dir/rewinddir_variation2.phpt b/ext/standard/tests/dir/rewinddir_variation2.phpt
index 09fb40ea01..092839e497 100644
--- a/ext/standard/tests/dir/rewinddir_variation2.phpt
+++ b/ext/standard/tests/dir/rewinddir_variation2.phpt
@@ -36,7 +36,7 @@ rmdir($dir_path);
 
 -- Create the directory handle, read and close the directory --
 resource(%d) of type (stream)
-unicode(1) "."
+unicode(%d) "%s"
 
 -- Call to rewinddir() --