[前][次][番号順一覧][スレッド一覧]

ruby-changes:50001

From: nobu <ko1@a...>
Date: Wed, 31 Jan 2018 13:02:25 +0900 (JST)
Subject: [ruby-changes:50001] nobu:r62119 (trunk): trick ruby-mode.el by heredocs

nobu	2018-01-31 13:02:17 +0900 (Wed, 31 Jan 2018)

  New Revision: 62119

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62119

  Log:
    trick ruby-mode.el by heredocs

  Modified files:
    trunk/test/ruby/test_io.rb
    trunk/test/ruby/test_io_m17n.rb
    trunk/test/ruby/test_process.rb
    trunk/test/ruby/test_string.rb
Index: test/ruby/test_process.rb
===================================================================
--- test/ruby/test_process.rb	(revision 62118)
+++ test/ruby/test_process.rb	(revision 62119)
@@ -246,11 +246,14 @@ class TestProcess < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_process.rb#L246
     assert_raise(ArgumentError) do
       system(RUBY, '-e', 'exit',  'rlimit_bogus'.to_sym => 123)
     end
-    assert_separately([],<<-"end;") # [ruby-core:82033] [Bug #13744]
+    assert_separately([],"#{<<-"begin;"}\n#{<<~'end;'}")
+    BUG = "[ruby-core:82033] [Bug #13744]"
+    RUBY = "#{RUBY}"
+    begin;
       assert(system("#{RUBY}", "-e",
                  "exit([3600,3600] == Process.getrlimit(:CPU))",
-             'rlimit_cpu'.to_sym => 3600))
-      assert_raise(ArgumentError) do
+             'rlimit_cpu'.to_sym => 3600), BUG)
+      assert_raise(ArgumentError, BUG) do
         system("#{RUBY}", '-e', 'exit',  :rlimit_bogus => 123)
       end
     end;
Index: test/ruby/test_string.rb
===================================================================
--- test/ruby/test_string.rb	(revision 62118)
+++ test/ruby/test_string.rb	(revision 62119)
@@ -659,7 +659,9 @@ CODE https://github.com/ruby/ruby/blob/trunk/test/ruby/test_string.rb#L659
       assert_raise(ArgumentError) {S("mypassword".encode(enc)).crypt(S("aa"))}
     end
 
-    @cls == String and assert_no_memory_leak([], 's = ""', <<~'end;') # do
+    @cls == String and
+      assert_no_memory_leak([], 's = ""', "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
       1000.times { s.crypt(-"..").clear  }
     end;
   end
Index: test/ruby/test_io.rb
===================================================================
--- test/ruby/test_io.rb	(revision 62118)
+++ test/ruby/test_io.rb	(revision 62119)
@@ -2535,7 +2535,8 @@ End https://github.com/ruby/ruby/blob/trunk/test/ruby/test_io.rb#L2535
 
     assert_in_out_err([], "$> = $stderr\nputs 'foo'", [], %w(foo))
 
-    assert_separately(%w[-Eutf-8], <<-"end;") #    do
+    assert_separately(%w[-Eutf-8], "#{<<~"begin;"}\n#{<<~"end;"}")
+    begin;
       alias $\u{6a19 6e96 51fa 529b} $stdout
       x = eval("class X\u{307b 3052}; self; end".encode("euc-jp"))
       assert_raise_with_message(TypeError, /\\$\u{6a19 6e96 51fa 529b} must.*, X\u{307b 3052} given/) do
Index: test/ruby/test_io_m17n.rb
===================================================================
--- test/ruby/test_io_m17n.rb	(revision 62118)
+++ test/ruby/test_io_m17n.rb	(revision 62119)
@@ -2121,12 +2121,14 @@ EOT https://github.com/ruby/ruby/blob/trunk/test/ruby/test_io_m17n.rb#L2121
   end
 
   def test_bom_too_long_utfname
-    assert_separately([], <<-'end;') # do
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
       assert_warn(/Unsupported encoding/) {
         open(IO::NULL, "r:bom|utf-" + "x" * 10000) {}
       }
     end;
-    assert_separately([], <<-'end;') # do
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
       assert_warn(/Unsupported encoding/) {
         open(IO::NULL, encoding: "bom|utf-" + "x" * 10000) {}
       }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]