From e941e5050699c9f9806f726aa430feafcc5828ea Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 9 Aug 2013 13:20:58 +0000
Subject: ruby.c: use String path version parser functions

* ruby.c (load_file_internal): use rb_parser_compile_string_path and
  rb_parser_compile_file_path, String path name versions.  [Bug #8753]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42468 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/test_require.rb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb
index 68ce1196dd..26d7d74d96 100644
--- a/test/ruby/test_require.rb
+++ b/test/ruby/test_require.rb
@@ -68,6 +68,13 @@ class TestRequire < Test::Unit::TestCase
     assert_require_nonascii_path(encoding, bug8676)
   end
 
+  def test_require_nonascii_path_shift_jis
+    bug8676 = '[ruby-core:56136] [Bug #8676]'
+    encoding = Encoding::Shift_JIS
+    return if Encoding.find('filesystem') == encoding
+    assert_require_nonascii_path(encoding, bug8676)
+  end
+
   def assert_require_nonascii_path(encoding, bug)
     Dir.mktmpdir {|tmp|
       dir = "\u3042" * 5
@@ -77,7 +84,7 @@ class TestRequire < Test::Unit::TestCase
         skip "cannot convert path encoding to #{encoding}"
       end
       Dir.mkdir(File.dirname(require_path))
-      open(require_path, "wb") {}
+      open(require_path, "wb") {|f| f.puts '$:.push __FILE__'}
       begin
         load_path = $:.dup
         features = $".dup
@@ -87,6 +94,8 @@ class TestRequire < Test::Unit::TestCase
         $:.clear
         assert_nothing_raised(LoadError, bug) {
           assert(require(require_path), bug)
+          assert_equal(Encoding.find(encoding), $".last.encoding)
+          assert_equal(Encoding.find(encoding), $:.last.encoding, '[Bug #8753]')
           assert(!require(require_path), bug)
         }
       ensure
-- 
cgit v1.2.3