kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 56224: [Backport #12785]

Browse source 
* 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
This commit is contained in:
nagachika 2017-02-07 16:38:52 +00:00
parent 6ef99fec9f
commit 7d3b03f9fe
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/misc/test_ruby_mode.rb
View file

@ -19,6 +19,9 @@ end
class TestRubyMode class TestRubyMode
EVAL_OPT = "--eval" EVAL_OPT = "--eval"
EXPR_SAVE = "(save-buffer)" EXPR_SAVE = "(save-buffer)"
finish_mark = "ok-#{$$}"
FINISH_MARK = /^#{finish_mark}$/
EXPR_FINISH = "(print \'#{finish_mark})"
EXPR_RUBYMODE = "(ruby-mode)" EXPR_RUBYMODE = "(ruby-mode)"
EXPR_NOBACKUP = "(progn" \ EXPR_NOBACKUP = "(progn" \
" (set (make-local-variable \'backup-inhibited) t)" \ " (set (make-local-variable \'backup-inhibited) t)" \
@ -32,6 +35,7 @@ class TestRubyMode
exprs = exprs.map {|expr| [EVAL_OPT, expr]}.flatten exprs = exprs.map {|expr| [EVAL_OPT, expr]}.flatten
exprs.unshift(EVAL_OPT, EXPR_RUBYMODE) exprs.unshift(EVAL_OPT, EXPR_RUBYMODE)
exprs.unshift(EVAL_OPT, EXPR_NOBACKUP) 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} output = IO.popen([*EMACS, tmp.path, *exprs, err:[:child, :out]], "r") {|e| e.read}
tmp.open tmp.open
result = tmp.read result = tmp.read
@ -50,7 +54,7 @@ class TestRubyMode
source.gsub!(space, '') source.gsub!(space, '')
end end
result, output = run_emacs(source, EXPR_INDENT, EXPR_SAVE) 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}) assert_equal(expected, result, message(*message) {diff expected, result})
end end

8
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.3.3" #define RUBY_VERSION "2.3.3"
#define RUBY_RELEASE_DATE "2017-01-17" #define RUBY_RELEASE_DATE "2017-02-08"
#define RUBY_PATCHLEVEL 237 #define RUBY_PATCHLEVEL 238
#define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 1 #define RUBY_RELEASE_MONTH 2
#define RUBY_RELEASE_DAY 17 #define RUBY_RELEASE_DAY 8
#include "ruby/version.h" #include "ruby/version.h"