summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2023-06-14 01:21:27 +0900
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2024-06-19 13:34:45 +0900
commit25ac45b76ab3965dbb039b5daf760b1a7494d476 (patch)
tree7e4c39790d90b9f759f8d77527f138911c8c1b96
parentcbd587b4963ca12ae4b383cec6ad83e22aaaa081 (diff)
Allow test-unit-ruby-core files to be loaded from bundled gems
Separate the directly from the customized test-unit, since it may not work with bundled gems.
-rw-r--r--gems/lib/core_assertions.rb1
-rw-r--r--gems/lib/rake/extensiontask.rb (renamed from tool/dummy-rake-compiler/rake/extensiontask.rb)0
-rw-r--r--tool/test-bundled-gems.rb3
3 files changed, 2 insertions, 2 deletions
diff --git a/gems/lib/core_assertions.rb b/gems/lib/core_assertions.rb
new file mode 100644
index 0000000000..7334063885
--- /dev/null
+++ b/gems/lib/core_assertions.rb
@@ -0,0 +1 @@
+require_relative "../../tool/lib/core_assertions.rb"
diff --git a/tool/dummy-rake-compiler/rake/extensiontask.rb b/gems/lib/rake/extensiontask.rb
index 62b7ff8018..62b7ff8018 100644
--- a/tool/dummy-rake-compiler/rake/extensiontask.rb
+++ b/gems/lib/rake/extensiontask.rb
diff --git a/tool/test-bundled-gems.rb b/tool/test-bundled-gems.rb
index 6f9a5e8738..79c6b61493 100644
--- a/tool/test-bundled-gems.rb
+++ b/tool/test-bundled-gems.rb
@@ -13,8 +13,7 @@ ENV["GEM_PATH"] = [File.realpath('.bundle'), File.realpath('../.bundle', __dir__
rake = File.realpath("../../.bundle/bin/rake", __FILE__)
gem_dir = File.realpath('../../gems', __FILE__)
-dummy_rake_compiler_dir = File.realpath('../dummy-rake-compiler', __FILE__)
-rubylib = [File.expand_path(dummy_rake_compiler_dir), ENV["RUBYLIB"]].compact.join(File::PATH_SEPARATOR)
+rubylib = [gem_dir+'/lib', ENV["RUBYLIB"]].compact.join(File::PATH_SEPARATOR)
exit_code = 0
ruby = ENV['RUBY'] || RbConfig.ruby
failed = []