summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSoutaro Matsumoto <matsumoto@soutaro.com>2021-11-12 02:01:53 +0900
committerGitHub <noreply@github.com>2021-11-12 02:01:53 +0900
commitdee2e9b2beea2f136801ca4594142a516f219549 (patch)
treecaac104dde4ca66fb847e1acae2bfeadb2ca98b7
parentc53aecee3bec524b91d7f2534291802a1cabb3f5 (diff)
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@ruby-lang.org>
Notes
Notes: Merged-By: soutaro <matsumoto@soutaro.com>
-rw-r--r--gems/bundled_gems2
-rw-r--r--tool/test-bundled-gems.rb6
2 files changed, 3 insertions, 5 deletions
diff --git a/gems/bundled_gems b/gems/bundled_gems
index 4be5e27141..904b7f2cf5 100644
--- a/gems/bundled_gems
+++ b/gems/bundled_gems
@@ -11,6 +11,6 @@ net-pop 0.1.1 https://github.com/ruby/net-pop
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 d9192f1bb9..3b9261d2ff 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|
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