matz	2008-06-09 15:41:06 +0900 (Mon, 09 Jun 2008)

  New Revision: 17043

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/test_dir.rb

  Log:
    * test/ruby/test_dir.rb (TestDir::test_glob): glob file names not sorted.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=17043&r2=17042&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/ruby/test_dir.rb?r1=17043&r2=17042&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 17042)
+++ ChangeLog	(revision 17043)
@@ -146,6 +146,10 @@
 
 	* gc.c (count_objects): clear hash after counting objects.
 
+Fri Jun  6 12:43:41 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* test/ruby/test_dir.rb (TestDir::test_glob): glob file names not sorted.
+
 Fri Jun  6 00:05:33 2008  Tanaka Akira  <akr@f...>
 
 	* lib/time.rb (Time.xmlschema): don't use float.  fix
Index: test/ruby/test_dir.rb
===================================================================
--- test/ruby/test_dir.rb	(revision 17042)
+++ test/ruby/test_dir.rb	(revision 17043)
@@ -143,13 +143,13 @@
   def test_glob
     assert_equal((%w(. ..) + (?a..?z).to_a).map{|f| File.join(@root, f) },
                  Dir.glob(File.join(@root, "*"), File::FNM_DOTMATCH).sort)
-    assert_equal([@root] + (?a..?z).map {|f| File.join(@root, f) },
-                 Dir.glob([@root, File.join(@root, "*")]))
-    assert_equal([@root] + (?a..?z).map {|f| File.join(@root, f) },
-                 Dir.glob(@root + "\0\0\0" + File.join(@root, "*")))
+    assert_equal([@root] + (?a..?z).map {|f| File.join(@root, f) }.sort,
+                 Dir.glob([@root, File.join(@root, "*")]).sort)
+    assert_equal([@root] + (?a..?z).map {|f| File.join(@root, f) }.sort,
+                 Dir.glob(@root + "\0\0\0" + File.join(@root, "*")).sort)
 
-    assert_equal((?a..?z).step(2).map {|f| File.join(File.join(@root, f), "") },
-                 Dir.glob(File.join(@root, "*/")))
+    assert_equal((?a..?z).step(2).map {|f| File.join(File.join(@root, f), "") }.sort,
+                 Dir.glob(File.join(@root, "*/")).sort)
 
     FileUtils.touch(File.join(@root, "{}"))
     assert_equal(%w({} a).map{|f| File.join(@root, f) },

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/