From 4a6b5f4622b5f33936fb1af7a8277335b7e15bbe Mon Sep 17 00:00:00 2001
From: Yusuke Endoh <mame@ruby-lang.org>
Date: Tue, 24 Aug 2021 18:07:50 +0900
Subject: [PATCH] Revert "tool/test-bundled-gems.rb: Use the bundled RBS code
 to test TypeProf"

This reverts commit 22deda43cb98aa3cee48d0bebbff7c4db1d7652a.

It was incomplete. Sorry!
---
 common.mk                 | 2 +-
 tool/test-bundled-gems.rb | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/common.mk b/common.mk
index 7605f5f6e5..f42d1b6805 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"
+		--install-dir .bundle --conservative "bundler" "minitest:~> 5" "test-unit" "rake" "hoe" "yard" "pry" "packnga" "rexml" "json-schema" "rbs"
 	$(ACTIONS_ENDGROUP)
 
 PREPARE_BUNDLED_GEMS = test-bundled-gems-prepare
diff --git a/tool/test-bundled-gems.rb b/tool/test-bundled-gems.rb
index 3f4c74b46a..d4c45332ab 100644
--- a/tool/test-bundled-gems.rb
+++ b/tool/test-bundled-gems.rb
@@ -17,13 +17,7 @@ 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"
-
-  if gem == "typeprof"
-    #test_command << " -I../rbs/lib"
-  end
-
-  test_command << " #{rake} test"
+  test_command = "#{ruby} -C #{gem_dir}/src/#{gem} -Ilib #{rake} test"
   first_timeout = 600 # 10min
 
   if gem == "rbs"