diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-24 01:19:43 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-24 01:19:43 +0000 |
commit | 967c01339126acb078e79fb9a9a618a435a27dba (patch) | |
tree | 716bbd72cd95dc2686cda8360dbfab6d0e17f144 /test/misc | |
parent | 1181ecbbd1694ba28f117186871a6a179f756c0e (diff) | |
download | ruby-967c01339126acb078e79fb9a9a618a435a27dba.tar.gz |
test_ruby_mode.rb: fix for Emacs 25.1
* test/misc/test_ruby_mode.rb (assert_indent): since write-region
in Emacs 25.1 no longer displays the "Wrote file" message, shows
the explicit message to check if successfully finished.
[ruby-core:77355] [Bug #12785]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56224 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/misc')
-rw-r--r-- | test/misc/test_ruby_mode.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/misc/test_ruby_mode.rb b/test/misc/test_ruby_mode.rb index 63af0d1ffe..bc5101911b 100644 --- a/test/misc/test_ruby_mode.rb +++ b/test/misc/test_ruby_mode.rb @@ -19,6 +19,9 @@ end class TestRubyMode EVAL_OPT = "--eval" EXPR_SAVE = "(save-buffer 0)" + finish_mark = "ok-#{$$}" + FINISH_MARK = /^#{finish_mark}$/ + EXPR_FINISH = "(print \'#{finish_mark})" EXPR_RUBYMODE = "(ruby-mode)" def run_emacs(src, *exprs) @@ -28,6 +31,7 @@ class TestRubyMode exprs = exprs.map {|expr| [EVAL_OPT, expr]}.flatten exprs.unshift(EVAL_OPT, EXPR_RUBYMODE) exprs.push(EVAL_OPT, EXPR_SAVE) + exprs.push(EVAL_OPT, EXPR_FINISH) output = IO.popen([*EMACS, tmp.path, *exprs, err:[:child, :out]], "r") {|e| e.read} tmp.open result = tmp.read @@ -46,7 +50,7 @@ class TestRubyMode source.gsub!(space, '') end result, output = run_emacs(source, EXPR_INDENT) - assert_match(/^Wrote /, output) + assert_match(FINISH_MARK, output) assert_equal(expected, result, message(*message) {diff expected, result}) end |