ruby-changes:60439
From: nagachika <ko1@a...>
Date: Wed, 18 Mar 2020 20:59:53 +0900 (JST)
Subject: [ruby-changes:60439] 0b9719f6e6 (ruby_2_6): merge revision(s) ee1334189b95cb5e7785e3415b332a7a76879ac3:
https://git.ruby-lang.org/ruby.git/commit/?id=0b9719f6e6 From 0b9719f6e6a6a72d18557860094db1fa89463f05 Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Wed, 18 Mar 2020 11:59:35 +0000 Subject: merge revision(s) ee1334189b95cb5e7785e3415b332a7a76879ac3: Fix uplevel git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67845 b2dd03c8-39d4-4d8f-98ff-823fe69b080e diff --git a/test/ruby/test_jit.rb b/test/ruby/test_jit.rb index ca74c2a..9b50a32 100644 --- a/test/ruby/test_jit.rb +++ b/test/ruby/test_jit.rb @@ -905,17 +905,17 @@ class TestJIT < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_jit.rb#L905 end # The shortest way to test one proc - def assert_compile_once(script, result_inspect:, insns: []) + def assert_compile_once(script, result_inspect:, insns: [], uplevel: 1) if script.match?(/\A\n.+\n\z/m) script = script.gsub(/^/, ' ') else script = " #{script} " end - assert_eval_with_jit("p proc {#{script}}.call", stdout: "#{result_inspect}\n", success_count: 1, insns: insns, uplevel: 2) + assert_eval_with_jit("p proc {#{script}}.call", stdout: "#{result_inspect}\n", success_count: 1, insns: insns, uplevel: uplevel + 1) end # Shorthand for normal test cases - def assert_eval_with_jit(script, stdout: nil, success_count:, min_calls: 1, insns: [], uplevel: 3) + def assert_eval_with_jit(script, stdout: nil, success_count:, min_calls: 1, insns: [], uplevel: 1) out, err = eval_with_jit(script, verbose: 1, min_calls: min_calls) actual = err.scan(/^#{JIT_SUCCESS_PREFIX}:/).size @@ -924,7 +924,7 @@ class TestJIT < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_jit.rb#L924 insns.each do |insn| unless used_insns.include?(insn) $stderr.puts - warn "'#{insn}' insn is not included in the script. Actual insns are: #{used_insns.join(' ')}\n", uplevel: uplevel + warn "'#{insn}' insn is not included in the script. Actual insns are: #{used_insns.join(' ')}\n", uplevel: uplevel+2 end TestJIT.untested_insns.delete(insn) end diff --git a/version.h b/version.h index 78f7211..4d1ab59 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L1 #define RUBY_VERSION "2.6.6" #define RUBY_RELEASE_DATE "2020-03-18" -#define RUBY_PATCHLEVEL 132 +#define RUBY_PATCHLEVEL 133 #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 3 -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/