diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-01-31 04:02:17 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-01-31 04:02:17 +0000 |
commit | e97cc464605a5d6c9417bb449f27b36ceeb3e840 (patch) | |
tree | 49c3dcfa9cec9daa29e84006814aa2844f255d6b | |
parent | f1b7bf10471d01e3a073c8b9ff8aba3478e30543 (diff) | |
download | ruby-e97cc464605a5d6c9417bb449f27b36ceeb3e840.tar.gz |
trick ruby-mode.el by heredocs
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62119 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | test/ruby/test_io.rb | 3 | ||||
-rw-r--r-- | test/ruby/test_io_m17n.rb | 6 | ||||
-rw-r--r-- | test/ruby/test_process.rb | 9 | ||||
-rw-r--r-- | test/ruby/test_string.rb | 4 |
4 files changed, 15 insertions, 7 deletions
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index 877f95658d..0b26608a0e 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -2535,7 +2535,8 @@ End 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 diff --git a/test/ruby/test_io_m17n.rb b/test/ruby/test_io_m17n.rb index 8ba34845fa..8dfa5d5500 100644 --- a/test/ruby/test_io_m17n.rb +++ b/test/ruby/test_io_m17n.rb @@ -2121,12 +2121,14 @@ EOT 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) {} } diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb index 5eaf9162c7..57bfd78f7c 100644 --- a/test/ruby/test_process.rb +++ b/test/ruby/test_process.rb @@ -246,11 +246,14 @@ class TestProcess < Test::Unit::TestCase 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; diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index dd3a0349b5..1b23d832f2 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -659,7 +659,9 @@ CODE 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 |