From 6fb4206cfbd8431a19634ac94f9693cc21515d5f Mon Sep 17 00:00:00 2001 From: nagachika Date: Fri, 20 Mar 2020 02:54:46 +0000 Subject: merge revision(s) 67325: Show retry's stdout as well because stderr did not have sufficient information https://ci.appveyor.com/project/ruby/ruby/builds/23242505/job/dirugxujk70nnhp6 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67848 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_jit.rb | 6 ++++-- version.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test/ruby/test_jit.rb b/test/ruby/test_jit.rb index b10e5ea00f..fd5ccc87f3 100644 --- a/test/ruby/test_jit.rb +++ b/test/ruby/test_jit.rb @@ -943,7 +943,7 @@ class TestJIT < Test::Unit::TestCase # Add --jit-verbose=2 logs for cl.exe because compiler's error message is suppressed # for cl.exe with --jit-verbose=1. See `start_process` in mjit_worker.c. if RUBY_PLATFORM.match?(/mswin/) && success_count != actual - _, err2 = eval_with_jit(script, verbose: 2, min_calls: min_calls) + out2, err2 = eval_with_jit(script, verbose: 2, min_calls: min_calls) end # Make sure that the script has insns expected to be tested @@ -959,7 +959,9 @@ class TestJIT < Test::Unit::TestCase assert_equal( success_count, actual, "Expected #{success_count} times of JIT success, but succeeded #{actual} times.\n\n"\ - "script:\n#{code_block(script)}\nstderr:\n#{code_block(err)}#{("\nstderr(verbose=2 retry):\n#{code_block(err2)}" if err2)}", + "script:\n#{code_block(script)}\nstderr:\n#{code_block(err)}#{( + "\nstdout(verbose=2 retry):\n#{code_block(out2)}\nstderr(verbose=2 retry):\n#{code_block(err2)}" if out2 || err2 + )}", ) if stdout assert_equal(stdout, out, "Expected stdout #{out.inspect} to match #{stdout.inspect} with script:\n#{code_block(script)}") diff --git a/version.h b/version.h index 6db3785be9..4b67252cfe 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.6.6" #define RUBY_RELEASE_DATE "2020-03-20" -#define RUBY_PATCHLEVEL 135 +#define RUBY_PATCHLEVEL 136 #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 3 -- cgit v1.2.3