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

From dee2e9b2beea2f136801ca4594142a516f219549 Mon Sep 17 00:00:00 2001
From: Soutaro Matsumoto <matsumoto@s...>
Date: Fri, 12 Nov 2021 02:01:53 +0900
Subject: Bundle RBS 1.7.0 (#5105)

* Bundle RBS 1.7.0

* tool/test-bundled-gems.rb: Use a correct path to Check if rbs is built

* tool/test-bundled-gems.rb: lib/rbs/parse.y is no longer created

Co-authored-by: Yusuke Endoh <mame@r...>
---
 gems/bundled_gems         | 2 +-
 tool/test-bundled-gems.rb | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/gems/bundled_gems b/gems/bundled_gems
index 4be5e27141f..904b7f2cf53 100644
--- a/gems/bundled_gems
+++ b/gems/bundled_gems
@@ -11,6 +11,6 @@ net-pop 0.1.1 https://github.com/ruby/net-pop https://github.com/ruby/ruby/blob/trunk/gems/bundled_gems#L11
 net-smtp 0.3.0 https://github.com/ruby/net-smtp
 matrix 0.4.2 https://github.com/ruby/matrix
 prime 0.1.2 https://github.com/ruby/prime
-rbs 1.7.0.beta.5 https://github.com/ruby/rbs
+rbs 1.7.0 https://github.com/ruby/rbs
 typeprof 0.20.2 https://github.com/ruby/typeprof
 debug 1.3.4 https://github.com/ruby/debug
diff --git a/tool/test-bundled-gems.rb b/tool/test-bundled-gems.rb
index d9192f1bb96..3b9261d2ff1 100644
--- a/tool/test-bundled-gems.rb
+++ b/tool/test-bundled-gems.rb
@@ -23,14 +23,12 @@ File.foreach("#{gem_dir}/bundled_gems") do |line| https://github.com/ruby/ruby/blob/trunk/tool/test-bundled-gems.rb#L23
   first_timeout = 600 # 10min
 
   if gem == "typeprof"
-    raise "need to run rbs test suite before typeprof" unless File.readable?("#{gem_dir}/src/rbs/lib/rbs/parser.rb")
+    rbs_build_dir = 'ext/-test-/gems/rbs'
+    raise "need to run rbs test suite before typeprof" unless File.readable?("#{rbs_build_dir}/rbs_extension.so")
     ENV["RUBYLIB"] = ["#{gem_dir}/src/rbs/lib", ENV.fetch("RUBYLIB", nil)].compact.join(":")
   end
 
   if gem == "rbs"
-    racc = File.realpath("../../libexec/racc", __FILE__)
-    pid = Process.spawn("#{ruby} -C #{gem_dir}/src/#{gem} -Ilib #{racc} -v -o lib/rbs/parser.rb lib/rbs/parser.y")
-    Process.waitpid(pid)
     test_command << " stdlib_test validate"
 
     first_timeout *= 3
-- 
cgit v1.2.1


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