[前][次][番号順一覧][スレッド一覧]

ruby-changes:58014

From: Benoit <ko1@a...>
Date: Sun, 29 Sep 2019 21:08:14 +0900 (JST)
Subject: [ruby-changes:58014] a27dc83113 (master): Pass $(XRUBY) to test-bundled-gems.rb since RbConfig.ruby is incorrect for miniruby

https://git.ruby-lang.org/ruby.git/commit/?id=a27dc83113

From a27dc83113afa9831dcdf919138666b09a73ccf6 Mon Sep 17 00:00:00 2001
From: Benoit Daloze <eregontp@g...>
Date: Sun, 29 Sep 2019 12:38:21 +0200
Subject: Pass $(XRUBY) to test-bundled-gems.rb since RbConfig.ruby is
 incorrect for miniruby


diff --git a/template/Makefile.in b/template/Makefile.in
index 117c1cd..4c817b1 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -536,7 +536,7 @@ cont.$(OBJEXT): $(COROUTINE_H) https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L536
 TEST_BUNDLED_GEMS_ALLOW_FAILURES =
 
 test-bundled-gems-run:
-	$(Q) $(XRUBY) $(srcdir)/tool/test-bundled-gems.rb
+	$(Q) $(XRUBY) $(srcdir)/tool/test-bundled-gems.rb $(XRUBY)
 
 update-src::
 	@$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP)
diff --git a/tool/test-bundled-gems.rb b/tool/test-bundled-gems.rb
index 735f7f4..9035e20 100644
--- a/tool/test-bundled-gems.rb
+++ b/tool/test-bundled-gems.rb
@@ -9,7 +9,7 @@ File.foreach('gems/bundled_gems') do |line| https://github.com/ruby/ruby/blob/trunk/tool/test-bundled-gems.rb#L9
   puts "\nTesting the #{gem} gem"
 
   gem_src_dir = File.expand_path("../../gems/src/#{gem}", __FILE__ )
-  test_command = "#{RbConfig.ruby} -C #{gem_src_dir} -Ilib ../../../.bundle/bin/rake"
+  test_command = "#{ARGV.join(' ')} -C #{gem_src_dir} -Ilib ../../../.bundle/bin/rake"
   puts test_command
   system test_command
 
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]