From c5c15a565b9b88745fe08f2ff78c2e0e5b401498 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 14 Jun 2023 01:21:27 +0900 Subject: [PATCH] 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. --- gems/lib/core_assertions.rb | 1 + {tool/dummy-rake-compiler => gems/lib}/rake/extensiontask.rb | 0 tool/test-bundled-gems.rb | 3 +-- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 gems/lib/core_assertions.rb rename {tool/dummy-rake-compiler => gems/lib}/rake/extensiontask.rb (100%) diff --git a/gems/lib/core_assertions.rb b/gems/lib/core_assertions.rb new file mode 100644 index 00000000000000..7334063885a66a --- /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 similarity index 100% rename from tool/dummy-rake-compiler/rake/extensiontask.rb rename to gems/lib/rake/extensiontask.rb diff --git a/tool/test-bundled-gems.rb b/tool/test-bundled-gems.rb index 9e39030e04c7a8..07b7e310421fe4 100644 --- a/tool/test-bundled-gems.rb +++ b/tool/test-bundled-gems.rb @@ -15,8 +15,7 @@ colorize = Colorize.new 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 = []