From f9e9eee677e8196da7288f4ab7754ebe345d7ed9 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 3 Aug 2011 07:10:56 +0000
Subject: * util.c, include/ruby/util.h (ruby_add_suffix): remove the function.
   [Bug #5153] [ruby-core:38736]

* io.c (argf_next_argv): remove the call of above function.

* ext/-test-/add_suffix, test/-ext-/test_add_suffix.rb: remove the test
  extension module because this is only for testsing ruby_add_suffix().

* LEGAL: remove the mention about a part of util.c, because now we
  removed the part.

* io.c (argf_next_argv): now the new filename is not guranteed to
  use, so should check the return value of rename(2).

* test/ruby/test_argf.rb (TestArgf#test_inplace_rename_impossible):
  now we expect same result with other platforms on no_safe_rename
  platforms (=Windows).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32826 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/-ext-/test_add_suffix.rb | 47 -------------------------------------------
 test/ruby/test_argf.rb        | 15 ++++----------
 2 files changed, 4 insertions(+), 58 deletions(-)
 delete mode 100644 test/-ext-/test_add_suffix.rb

(limited to 'test')

diff --git a/test/-ext-/test_add_suffix.rb b/test/-ext-/test_add_suffix.rb
deleted file mode 100644
index 0520baef8c..0000000000
--- a/test/-ext-/test_add_suffix.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-require 'test/unit'
-require_relative '../ruby/envutil'
-require "-test-/add_suffix/bug"
-
-class Test_AddSuffix < Test::Unit::TestCase
-  Dir = "/dev/null/".freeze
-  Style_1 = (Dir+"foo").freeze
-
-  def test_style_0
-    assert_equal("a.x.y", Bug.add_suffix("a.x", ".y"))
-  end
-
-  def test_style_1
-    assert_equal(Style_1+".y", Bug.add_suffix(Style_1+".c", ".y"))
-    suffix = ".bak".freeze
-    assert_equal(Style_1+suffix, Bug.add_suffix(Style_1.dup, suffix))
-    assert_equal(Style_1+suffix, Bug.add_suffix(Style_1+".bar", suffix))
-    assert_equal(Style_1+".$$$", Bug.add_suffix(Style_1+suffix, suffix))
-    assert_equal(Style_1+suffix, Bug.add_suffix(Style_1+".$$$", suffix))
-    assert_equal(Style_1+".~~~", Bug.add_suffix(Style_1+".$$$", ".$$$"))
-    assert_equal(Dir+"makefile"+suffix, Bug.add_suffix(Dir+"makefile", suffix))
-  end
-
-  def test_style_2
-    suffix = "~"
-    assert_equal(Style_1+"~", Bug.add_suffix(Style_1.dup, suffix))
-    assert_equal(Style_1+".c~", Bug.add_suffix(Style_1+".c", suffix))
-    assert_equal(Style_1+".c~~", Bug.add_suffix(Style_1+".c~", suffix))
-    assert_equal(Style_1+"~.c~~", Bug.add_suffix(Style_1+".c~~", suffix))
-    assert_equal(Style_1+"~~.c~~", Bug.add_suffix(Style_1+"~.c~~", suffix))
-    assert_equal(Style_1+"~~~~~.cc~", Bug.add_suffix(Style_1+"~~~~~.ccc", suffix))
-    assert_equal(Style_1+"~~~~~.$$$", Bug.add_suffix(Style_1+"~~~~~.c~~", suffix))
-    assert_equal(Dir+"foo~.pas", Bug.add_suffix(Dir+"foo.pas", suffix))
-    assert_equal(Dir+"makefile.~", Bug.add_suffix(Dir+"makefile", suffix))
-    assert_equal(Dir+"longname.fi~", Bug.add_suffix(Dir+"longname.fil", suffix))
-    assert_equal(Dir+"longnam~.fi~", Bug.add_suffix(Dir+"longname.fi~", suffix))
-    assert_equal(Dir+"longnam~.$$$", Bug.add_suffix(Dir+"longnam~.fi~", suffix))
-  end
-
-  def test_style_3
-    base = "a"*1000
-    suffix = "-"+"b"*1000
-    assert_equal(base+".~~~", Bug.add_suffix(base, suffix))
-    assert_equal(base+".~~~", Bug.add_suffix(base+".$$$", suffix))
-    assert_equal(base+".$$$", Bug.add_suffix(base+".~~~", suffix))
-  end
-end
diff --git a/test/ruby/test_argf.rb b/test/ruby/test_argf.rb
index 0e709a204d..e249c757ea 100644
--- a/test/ruby/test_argf.rb
+++ b/test/ruby/test_argf.rb
@@ -201,21 +201,14 @@ class TestArgf < Test::Unit::TestCase
     t = make_tempfile
 
     assert_in_out_err(["-", t.path], <<-INPUT) do |r, e|
-      ARGF.inplace_mode = '/\\\\'
+      ARGF.inplace_mode = '/\\\\:'
       while line = ARGF.gets
         puts line.chomp + '.new'
       end
     INPUT
-      if no_safe_rename
-        assert_equal([], e)
-        assert_equal([], r)
-        assert_equal("foo.new\nbar.new\nbaz.new\n", File.read(t.path))
-        File.unlink(t.path + ".~~~") rescue nil
-      else
-        assert_match(/Can't rename .* to .*: .*. skipping file/, e.first) #'
-        assert_equal([], r)
-        assert_equal("foo\nbar\nbaz\n", File.read(t.path))
-      end
+      assert_match(/Can't rename .* to .*: .*. skipping file/, e.first) #'
+      assert_equal([], r)
+      assert_equal("foo\nbar\nbaz\n", File.read(t.path))
     end
   end
 
-- 
cgit v1.2.3