aboutsummaryrefslogtreecommitdiffstats
path: root/test/ruby
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-22 02:03:49 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-22 02:03:49 +0000
commitb09ff06845267dce70c8b7868a68ae88acd54af2 (patch)
tree41a5a3d2f082fc8a1e372ec6e75bcc822073433d /test/ruby
parent199dc8e0db47be9da115b84bcf253b4429a39792 (diff)
downloadruby-b09ff06845267dce70c8b7868a68ae88acd54af2.tar.gz
Dir.glob with FNM_EXTGLOB is optimized [Feature #13873]
The order of resulted array is changed in some cases. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60341 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby')
-rw-r--r--test/ruby/test_dir.rb2
-rw-r--r--test/ruby/test_fnmatch.rb4
2 files changed, 5 insertions, 1 deletions
diff --git a/test/ruby/test_dir.rb b/test/ruby/test_dir.rb
index cead4beb93..f12fd13c58 100644
--- a/test/ruby/test_dir.rb
+++ b/test/ruby/test_dir.rb
@@ -155,7 +155,7 @@ class TestDir < Test::Unit::TestCase
open(File.join(@root, "}}{}"), "wb") {}
open(File.join(@root, "}}a"), "wb") {}
assert_equal(%w(}}{} }}a).map {|f| File.join(@root, f)}, Dir.glob(File.join(@root, '}}{\{\},a}')))
- assert_equal(%w(}}{} }}a b c).map {|f| File.join(@root, f)}, Dir.glob(File.join(@root, '{\}\}{\{\},a},b,c}')))
+ assert_equal(%w(}}{} }}a b c).map {|f| File.join(@root, f)}.sort, Dir.glob(File.join(@root, '{\}\}{\{\},a},b,c}')).sort)
end
def test_glob_recursive
diff --git a/test/ruby/test_fnmatch.rb b/test/ruby/test_fnmatch.rb
index ca01a28698..2fb8796ab3 100644
--- a/test/ruby/test_fnmatch.rb
+++ b/test/ruby/test_fnmatch.rb
@@ -108,6 +108,10 @@ class TestFnmatch < Test::Unit::TestCase
feature5422 = '[ruby-core:40037]'
assert_file.for(feature5422).not_fnmatch?( "{.g,t}*", ".gem")
assert_file.for(feature5422).fnmatch?("{.g,t}*", ".gem", File::FNM_EXTGLOB)
+
+ assert_file.fnmatch?("{,.}*", ".gem", File::FNM_EXTGLOB)
+ assert_file.not_fnmatch?("{}*", ".gem", File::FNM_EXTGLOB)
+ assert_file.not_fnmatch?("{.}*", ".gem")
end
def test_unmatched_encoding