Skip path expansion for all wildcard characters

* win32/file.c (replace_to_long_name): skip expansion for all wildcard
  characters.
  [ruby-core:49451] [Bug #7374]

* test/ruby/test_file_exhaustive.rb: add more assertions to test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 1 deletions

diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb
index 3fd8b3374e..360a1c7cce 100644
--- a/test/ruby/test_file_exhaustive.rb
+++ b/test/ruby/test_file_exhaustive.rb
@@ -662,9 +662,11 @@ class TestFileExhaustive < Test::Unit::TestCase
     assert_equal("#{DRIVE}/dir", File.expand_path("#{DRIVE}/./dir"))
   end
 
-  def test_expand_path_does_not_expand_wildcard
+  def test_expand_path_does_not_expand_wildcards
     assert_equal("#{DRIVE}/*", File.expand_path("./*", "#{DRIVE}/"))
     assert_equal("#{Dir.pwd}/*", File.expand_path("./*", Dir.pwd))
+    assert_equal("#{DRIVE}/?", File.expand_path("./?", "#{DRIVE}/"))
+    assert_equal("#{Dir.pwd}/?", File.expand_path("./?", Dir.pwd))
   end if DRIVE
 
   def test_expand_path_does_not_modify_the_string_argument