mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
eval_error.c: default nil as "reverse" is now false [Feature #8661]
This commit is contained in:
parent
bf11bf31e2
commit
3ef09c6e66
2 changed files with 4 additions and 6 deletions
|
@ -309,9 +309,9 @@ rb_error_write(VALUE errinfo, VALUE emesg, VALUE errat, VALUE str, VALUE highlig
|
|||
errat = Qnil;
|
||||
}
|
||||
eclass = CLASS_OF(errinfo);
|
||||
if (NIL_P(reverse) || NIL_P(highlight)) {
|
||||
if (NIL_P(reverse)) reverse = Qfalse;
|
||||
if (NIL_P(highlight)) {
|
||||
VALUE tty = (VALUE)rb_stderr_tty_p();
|
||||
if (NIL_P(reverse)) reverse = tty;
|
||||
if (NIL_P(highlight)) highlight = tty;
|
||||
}
|
||||
if (reverse) {
|
||||
|
|
|
@ -1156,13 +1156,11 @@ $stderr = $stdout; raise "\x82\xa0"') do |outs, errs, status|
|
|||
if Exception.to_tty?
|
||||
assert_match(/\e/, message)
|
||||
message = message.gsub(/\e\[[\d;]*m/, '')
|
||||
assert_operator(message, :start_with?, remark)
|
||||
assert_operator(message, :end_with?, bottom)
|
||||
else
|
||||
assert_not_match(/\e/, message)
|
||||
assert_operator(message, :start_with?, bottom)
|
||||
assert_operator(message, :end_with?, top)
|
||||
end
|
||||
assert_operator(message, :start_with?, bottom)
|
||||
assert_operator(message, :end_with?, top)
|
||||
end
|
||||
|
||||
def test_exception_in_message
|
||||
|
|
Loading…
Add table
Reference in a new issue