diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-02-07 16:38:52 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-02-07 16:38:52 +0000 |
| commit | 7d3b03f9fe11acf6d762c2066c10018f78b82a10 (patch) | |
| tree | 797cc3fb58eeed6ede49eb66b1a4357bbec9b9f1 | |
| parent | 6ef99fec9fe040de2a682bcdcf46278d3aa05603 (diff) | |
merge revision(s) 56224: [Backport #12785]
* 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/branches/ruby_2_3@57565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | test/misc/test_ruby_mode.rb | 6 | ||||
| -rw-r--r-- | version.h | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/test/misc/test_ruby_mode.rb b/test/misc/test_ruby_mode.rb index a91e1c254c..a08dc62fc5 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)" + finish_mark = "ok-#{$$}" + FINISH_MARK = /^#{finish_mark}$/ + EXPR_FINISH = "(print \'#{finish_mark})" EXPR_RUBYMODE = "(ruby-mode)" EXPR_NOBACKUP = "(progn" \ " (set (make-local-variable \'backup-inhibited) t)" \ @@ -32,6 +35,7 @@ class TestRubyMode exprs = exprs.map {|expr| [EVAL_OPT, expr]}.flatten exprs.unshift(EVAL_OPT, EXPR_RUBYMODE) exprs.unshift(EVAL_OPT, EXPR_NOBACKUP) + 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 @@ -50,7 +54,7 @@ class TestRubyMode source.gsub!(space, '') end result, output = run_emacs(source, EXPR_INDENT, EXPR_SAVE) - assert_match(/^Wrote /, output) + assert_match(FINISH_MARK, output) assert_equal(expected, result, message(*message) {diff expected, result}) end @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.3.3" -#define RUBY_RELEASE_DATE "2017-01-17" -#define RUBY_PATCHLEVEL 237 +#define RUBY_RELEASE_DATE "2017-02-08" +#define RUBY_PATCHLEVEL 238 #define RUBY_RELEASE_YEAR 2017 -#define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 17 +#define RUBY_RELEASE_MONTH 2 +#define RUBY_RELEASE_DAY 8 #include "ruby/version.h" |