merges r23989 from trunk into ruby_1_9_1.

--
* file.c (rb_file_s_basename): returns new string instead of
  shared string from FilePathStringValue().  [ruby-core:24199]

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

1 files changed, 4 insertions, 2 deletions

diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb
index 420b3d527e..0a4d6d39f4 100644
--- a/test/ruby/test_file_exhaustive.rb
+++ b/test/ruby/test_file_exhaustive.rb
@@ -385,8 +385,10 @@ class TestFileExhaustive < Test::Unit::TestCase
 
   def test_basename
     assert_equal(File.basename(@file).sub(/\.test$/, ""), File.basename(@file, ".test"))
-    assert_equal("", File.basename(""))
-    assert_equal("foo", File.basename("foo"))
+    assert_equal("", s = File.basename(""))
+    assert(!s.frozen?, '[ruby-core:24199]')
+    assert_equal("foo", s = File.basename("foo"))
+    assert(!s.frozen?, '[ruby-core:24199]')
     assert_equal("foo", File.basename("foo", ".ext"))
     assert_equal("foo", File.basename("foo.ext", ".ext"))
     assert_equal("foo", File.basename("foo.ext", ".*"))