diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2020-03-20 07:01:35 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2020-03-20 07:01:35 +0000 |
commit | 88670795517a092d082211998772851f076c986b (patch) | |
tree | eaa8b3b6234d76c641c2eb92bc3af80de8a1f507 | |
parent | 38660f42cd594c51778baa8603ac432304d502c6 (diff) |
merge revision(s) 87ad5ea729735ff6b8f1ac0bb3aad2aedd6f716e,9745e90197f129708986803e8913fb151862478a:
Skip jit_test on some new RubyCI envs for now
Propagate JIT skip to all tests
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67854 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | test/lib/jit_support.rb | 8 | ||||
-rw-r--r-- | version.h | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/test/lib/jit_support.rb b/test/lib/jit_support.rb index 5e47ff45e3..8d17ed9552 100644 --- a/test/lib/jit_support.rb +++ b/test/lib/jit_support.rb @@ -7,6 +7,12 @@ module JITSupport %r[\A.*/bin/intel64/icc\b], %r[\A/opt/developerstudio\d+\.\d+/bin/cc\z], ] + # freebsd12: cc1 internal failure https://rubyci.org/logs/rubyci.s3.amazonaws.com/freebsd12/ruby-master/log/20200306T103003Z.fail.html.gz + # rhel8: one or more PCH files were found, but they were invalid https://rubyci.org/logs/rubyci.s3.amazonaws.com/rhel8/ruby-master/log/20200306T153003Z.fail.html.gz + PENDING_RUBYCI_NICKNAMES = %w[ + freebsd12 + rhel8 + ] module_function # Run Ruby script with --jit-wait (Synchronous JIT compilation). @@ -45,7 +51,7 @@ module JITSupport return @supported if defined?(@supported) @supported = UNSUPPORTED_COMPILERS.all? do |regexp| !regexp.match?(RbConfig::CONFIG['MJIT_CC']) - end && RbConfig::CONFIG["MJIT_SUPPORT"] != 'no' + end && RbConfig::CONFIG["MJIT_SUPPORT"] != 'no' && !PENDING_RUBYCI_NICKNAMES.include?(ENV['RUBYCI_NICKNAME']) end def remove_mjit_logs(stderr) @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.6.6" #define RUBY_RELEASE_DATE "2020-03-20" -#define RUBY_PATCHLEVEL 140 +#define RUBY_PATCHLEVEL 141 #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 3 |