[前][次][番号順一覧][スレッド一覧]

ruby-changes:62162

From: nagachika <ko1@a...>
Date: Thu, 9 Jul 2020 21:04:15 +0900 (JST)
Subject: [ruby-changes:62162] 601613fdf3 (ruby_2_7): merge revision(s) 87ad5ea729735ff6b8f1ac0bb3aad2aedd6f716e,9745e90197f129708986803e8913fb151862478a:

https://git.ruby-lang.org/ruby.git/commit/?id=601613fdf3

From 601613fdf3907f3842a9d465926dca7c37d56f72 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Thu, 9 Jul 2020 21:03:58 +0900
Subject: merge revision(s)
 87ad5ea729735ff6b8f1ac0bb3aad2aedd6f716e,9745e90197f129708986803e8913fb151862478a:

	Skip jit_test on some new RubyCI envs for now

	Propagate JIT skip to all tests

diff --git a/test/lib/jit_support.rb b/test/lib/jit_support.rb
index 82c4a89..033da9f 100644
--- a/test/lib/jit_support.rb
+++ b/test/lib/jit_support.rb
@@ -8,6 +8,12 @@ module JITSupport https://github.com/ruby/ruby/blob/trunk/test/lib/jit_support.rb#L8
     %r[\A/opt/intel/.*/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).
@@ -47,7 +53,7 @@ module JITSupport https://github.com/ruby/ruby/blob/trunk/test/lib/jit_support.rb#L53
     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)
diff --git a/version.h b/version.h
index f43ec3f..b3740c8 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L2
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 89
+#define RUBY_PATCHLEVEL 90
 
 #define RUBY_RELEASE_YEAR 2020
 #define RUBY_RELEASE_MONTH 7
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]