diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/rubygems/test_gem_installer.rb | 9 |
2 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sat Jun 18 14:01:40 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> + + * test/rubygems/test_gem_installer.rb: Fixed broken test with extension + build. https://github.com/rubygems/rubygems/pull/1645 + Sat Jun 18 13:59:54 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> * lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb index b8bf24e183..ca48065bd4 100644 --- a/test/rubygems/test_gem_installer.rb +++ b/test/rubygems/test_gem_installer.rb @@ -1146,10 +1146,17 @@ gem 'other', version write_file File.join(@tempdir, "extconf.rb") do |io| io.write <<-RUBY require "mkmf" + + CONFIG['CC'] = '$(TOUCH) $@ ||' + CONFIG['LDSHARED'] = '$(TOUCH) $@ ||' + $ruby = '#{Gem.ruby}' + create_makefile("#{@spec.name}") RUBY end + write_file File.join(@tempdir, "depend") + write_file File.join(@tempdir, "a.c") do |io| io.write <<-C #include <ruby.h> @@ -1162,7 +1169,7 @@ gem 'other', version io.write "# b.rb" end - @spec.files += %w[extconf.rb lib/b.rb a.c] + @spec.files += %w[extconf.rb lib/b.rb depend a.c] use_ui @ui do path = Gem::Package.build @spec |