diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-09 06:41:06 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-09 06:41:06 +0000 |
| commit | 3854be4322afc4c90dafef6f7907354b7bbd83d7 (patch) | |
| tree | 910bac0c96d8d8eeac18594d11dceb0f4b7f1785 | |
| parent | 66054b9e3d3c5cfe05db0fbda565fc2b05b72a5e (diff) | |
| download | ruby-3854be4322afc4c90dafef6f7907354b7bbd83d7.tar.gz | |
* test/ruby/test_dir.rb (TestDir::test_glob): glob file names not sorted.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17043 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | test/ruby/test_dir.rb | 12 |
2 files changed, 10 insertions, 6 deletions
@@ -146,6 +146,10 @@ Fri Jun 6 15:05:02 2008 Tanaka Akira <akr@fsij.org> * gc.c (count_objects): clear hash after counting objects. +Fri Jun 6 12:43:41 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * test/ruby/test_dir.rb (TestDir::test_glob): glob file names not sorted. + Fri Jun 6 00:05:33 2008 Tanaka Akira <akr@fsij.org> * lib/time.rb (Time.xmlschema): don't use float. fix diff --git a/test/ruby/test_dir.rb b/test/ruby/test_dir.rb index e6d9e9c3ac..39b47720a7 100644 --- a/test/ruby/test_dir.rb +++ b/test/ruby/test_dir.rb @@ -143,13 +143,13 @@ class TestDir < Test::Unit::TestCase 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) }, |