summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-05-19 17:23:27 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-05-19 17:23:27 +0000
commit7d7aec241381d11317c16115f6592a0d3c6b7fce (patch)
tree083a5fdf401d5d1e4daf0fe63b941e86883d8224 /test
parent39b89ceeb4a875f12ed90278d291f5ea9135f35a (diff)
merge revision(s) 49859,49861,49865: [Backport #10941] [Backport #10978] [Backport #11089]
* dir.c (replace_real_basename): shouldn't create Ruby object before the object system is loaded. [ruby-core:68430] [Bug #10941] * dir.c (replace_real_basename): need to check the return value of GLOB_REALLOC(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50545 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/test_rubyoptions.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index 8d3da54997..7cb1248e53 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -720,6 +720,14 @@ class TestRubyOptions < Test::Unit::TestCase
bug10555, encoding: "locale")
end
end
+
+ def test_command_line_glob_with_dir
+ bug10941 = '[ruby-core:68430] [Bug #10941]'
+ with_tmpchdir do |dir|
+ Dir.mkdir('test')
+ assert_in_out_err(["-e", "", "test/*"], "", [], [], bug10941)
+ end
+ end
end
if /mswin|mingw/ =~ RUBY_PLATFORM