diff options
| author | nagachika <nagachika@ruby-lang.org> | 2022-10-23 19:14:08 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2022-10-23 19:14:08 +0900 |
| commit | ffa439fd29141626878f4c4b56e86b2fee17294e (patch) | |
| tree | a37e5483f452819b159b8d3f9e2d4df0bb485dc1 /test | |
| parent | 941c888b041decb45034572d766120f9be34986e (diff) | |
merge revision(s) 329d5424a479bb08e75bd750c51a5382e382731c: [Backport #19042]
[Bug #19042] Fix Dir.glob brace with '/'
Dir.glob brace pattern with '/' after '**' does not match
paths in recursive expansion process.
We expand braces with '/' before expanding a recursive.
Co-authored-by: Nobuyoshi Nakada <nobu@ruby-lang.org>
---
dir.c | 2 +-
test/ruby/test_dir.rb | 14 ++++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/test_dir.rb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/test/ruby/test_dir.rb b/test/ruby/test_dir.rb index 9474c6e927..39a1dae889 100644 --- a/test/ruby/test_dir.rb +++ b/test/ruby/test_dir.rb @@ -259,6 +259,20 @@ class TestDir < Test::Unit::TestCase end end + def test_glob_recursive_with_brace + Dir.chdir(@root) do + bug19042 = '[ruby-core:110220] [Bug #19042]' + %w"c/dir_a c/dir_b c/dir_b/dir".each do |d| + Dir.mkdir(d) + end + expected = %w"c/dir_a/file c/dir_b/dir/file" + expected.each do |f| + File.write(f, "") + end + assert_equal(expected, Dir.glob("**/{dir_a,dir_b/dir}/file"), bug19042) + end + end + def test_glob_order Dir.chdir(@root) do assert_equal(["#{@root}/a", "#{@root}/b"], Dir.glob("#{@root}/[ba]")) |