summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYusuke Endoh <[email protected]>2021-08-24 17:25:45 +0900
committerYusuke Endoh <[email protected]>2021-08-24 17:43:11 +0900
commit22deda43cb98aa3cee48d0bebbff7c4db1d7652a (patch)
tree3b81aa42e5ce5f5fec0207ea1768009eec485431
parentbcc5a2b67eb10836aa54279d88230b3cb349a2e3 (diff)
tool/test-bundled-gems.rb: Use the bundled RBS code to test TypeProf
Formerly, TypeProf was tested with the latest RBS code during `make test-bundled-gems`. However, when a new version of rbs is released, and if it is incompatible with TypeProf, `make test-bundled-gems` starts failing, which was annoying. By this change, TypeProf is tested with the bundled version of RBS.
-rw-r--r--common.mk2
-rw-r--r--tool/test-bundled-gems.rb8
2 files changed, 8 insertions, 2 deletions
diff --git a/common.mk b/common.mk
index f42d1b6805..7605f5f6e5 100644
--- a/common.mk
+++ b/common.mk
@@ -1372,7 +1372,7 @@ no-test-bundled-gems-prepare: no-test-bundled-gems-precheck
yes-test-bundled-gems-prepare: yes-test-bundled-gems-precheck
$(ACTIONS_GROUP)
$(XRUBY) -C "$(srcdir)" bin/gem install --no-document \
- --install-dir .bundle --conservative "bundler" "minitest:~> 5" "test-unit" "rake" "hoe" "yard" "pry" "packnga" "rexml" "json-schema" "rbs"
+ --install-dir .bundle --conservative "bundler" "minitest:~> 5" "test-unit" "rake" "hoe" "yard" "pry" "packnga" "rexml" "json-schema"
$(ACTIONS_ENDGROUP)
PREPARE_BUNDLED_GEMS = test-bundled-gems-prepare
diff --git a/tool/test-bundled-gems.rb b/tool/test-bundled-gems.rb
index d4c45332ab..3f4c74b46a 100644
--- a/tool/test-bundled-gems.rb
+++ b/tool/test-bundled-gems.rb
@@ -17,7 +17,13 @@ File.foreach("#{gem_dir}/bundled_gems") do |line|
next if ARGV.any? {|pat| !File.fnmatch?(pat, gem)}
puts "#{github_actions ? "##[group]" : "\n"}Testing the #{gem} gem"
- test_command = "#{ruby} -C #{gem_dir}/src/#{gem} -Ilib #{rake} test"
+ test_command = "#{ruby} -C #{gem_dir}/src/#{gem} -Ilib"
+
+ if gem == "typeprof"
+ #test_command << " -I../rbs/lib"
+ end
+
+ test_command << " #{rake} test"
first_timeout = 600 # 10min
if gem == "rbs"