diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-11-05 08:26:10 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-11-05 08:45:19 +0900 |
| commit | c7632fa80cd693be27b9bf85f1402b9c8812f325 (patch) | |
| tree | 124f9cad295d0a07c4fbd91d2d5879cff62e0b67 | |
| parent | ebbe396d3c89345a1c36c0b5154e314cc33e19b7 (diff) | |
| download | ruby-c7632fa80cd693be27b9bf85f1402b9c8812f325.tar.gz | |
Do not occupy `ARGV` by XRUBY command
Instead run test-bundled-gems.rb by `ENV['RUBY']`, which should be
set by runruby.rb.
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | tool/test-bundled-gems.rb | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -1295,7 +1295,7 @@ no-test-bundled-gems: # TEST_BUNDLED_GEMS_ALLOW_FAILURES = test-bundled-gems-run: $(PREPARE_BUNDLED_GEMS) - $(Q) $(XRUBY) $(srcdir)/tool/test-bundled-gems.rb $(XRUBY) + $(Q) $(XRUBY) $(srcdir)/tool/test-bundled-gems.rb test-bundler-precheck: $(arch)-fake.rb programs diff --git a/tool/test-bundled-gems.rb b/tool/test-bundled-gems.rb index 02e1812929..ded4bc852a 100644 --- a/tool/test-bundled-gems.rb +++ b/tool/test-bundled-gems.rb @@ -5,12 +5,13 @@ allowed_failures = allowed_failures.split(',').reject(&:empty?) gem_dir = File.expand_path('../../gems', __FILE__) exit_code = 0 +ruby = ENV['RUBY'] || RbConfig.ruby File.foreach("#{gem_dir}/bundled_gems") do |line| gem = line.split.first puts "\nTesting the #{gem} gem" gem_src_dir = File.expand_path("#{gem_dir}/src/#{gem}", __FILE__) - test_command = "#{ARGV.join(' ')} -C #{gem_src_dir} -Ilib ../../../.bundle/bin/rake" + test_command = "#{ruby} -C #{gem_src_dir} -Ilib ../../../.bundle/bin/rake" puts test_command system test_command |