diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2020-03-20 06:43:59 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2020-03-20 06:43:59 +0000 |
commit | cc735a96ae8af32d077fda350a1273843d713df8 (patch) | |
tree | 33426373397f906f95b87fce188b3bcdf8b18e8b | |
parent | 872ca443c30876e1f6453d616c70080632a32174 (diff) |
merge revision(s) 66590,66615,66781:
jit_support.rb: skip testing MJIT on oracle developer studio
jit_support.rb: deal with -std=c99 flag
CC is changed from "icc" to "icc -std=c99" by r66605.
https://rubyci.org/logs/rubyci.s3.amazonaws.com/icc-x64/ruby-trunk/log/20181228T130003Z.fail.html.gz
test_jit.rb: change format of test error output
to avoid breaking redmine quote like
https://bugs.ruby-lang.org/issues/15522
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67852 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | test/lib/jit_support.rb | 9 | ||||
-rw-r--r-- | test/ruby/test_jit.rb | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/test/lib/jit_support.rb b/test/lib/jit_support.rb index 82f53ec59d..c1624cc3b2 100644 --- a/test/lib/jit_support.rb +++ b/test/lib/jit_support.rb @@ -4,7 +4,8 @@ module JITSupport JIT_TIMEOUT = 600 # 10min for each... JIT_SUCCESS_PREFIX = 'JIT success \(\d+\.\dms\)' UNSUPPORTED_COMPILERS = [ - 'icc', + %r[\Aicc\b], + %r[\A/opt/developerstudio\d+\.\d+/bin/cc\z], ] module_function @@ -42,7 +43,9 @@ module JITSupport def supported? return @supported if defined?(@supported) - @supported = !UNSUPPORTED_COMPILERS.include?(RbConfig::CONFIG['CC']) + @supported = UNSUPPORTED_COMPILERS.all? do |regexp| + !regexp.match?(RbConfig::CONFIG['CC']) + end end def remove_mjit_logs(stderr) @@ -54,7 +57,7 @@ module JITSupport end def code_block(code) - "```\n#{code}\n```\n\n" + %Q["""\n#{code}\n"""\n\n] end # We're retrying cc1 not found error on gcc, which should be solved in the future but ignored for now. diff --git a/test/ruby/test_jit.rb b/test/ruby/test_jit.rb index 37dc18f1bf..eae75b8ddf 100644 --- a/test/ruby/test_jit.rb +++ b/test/ruby/test_jit.rb @@ -634,7 +634,7 @@ class TestJIT < Test::Unit::TestCase end end; - debug_info = "stdout:\n```\n#{out}\n```\n\nstderr:\n```\n#{err}```\n" + debug_info = %Q[stdout:\n"""\n#{out}\n"""\n\nstderr:\n"""\n#{err}"""\n] assert_equal('012345678910', out, debug_info) compactions, errs = err.lines.partition do |l| l.match?(/\AJIT compaction \(\d+\.\dms\): Compacted \d+ methods ->/) @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.6.6" #define RUBY_RELEASE_DATE "2020-03-20" -#define RUBY_PATCHLEVEL 138 +#define RUBY_PATCHLEVEL 139 #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 3 |