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

ruby-changes:43369

From: hsbt <ko1@a...>
Date: Sat, 18 Jun 2016 14:12:02 +0900 (JST)
Subject: [ruby-changes:43369] hsbt:r55443 (trunk): * test/rubygems/test_gem_installer.rb: Fixed broken test with extension

hsbt	2016-06-18 14:11:57 +0900 (Sat, 18 Jun 2016)

  New Revision: 55443

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55443

  Log:
    * test/rubygems/test_gem_installer.rb: Fixed broken test with extension
      build. https://github.com/rubygems/rubygems/pull/1645

  Modified files:
    trunk/ChangeLog
    trunk/test/rubygems/test_gem_installer.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 55442)
+++ ChangeLog	(revision 55443)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Jun 18 14:01:40 2016  SHIBATA Hiroshi  <hsbt@r...>
+
+	* 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@r...>
 
 	* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems
Index: test/rubygems/test_gem_installer.rb
===================================================================
--- test/rubygems/test_gem_installer.rb	(revision 55442)
+++ test/rubygems/test_gem_installer.rb	(revision 55443)
@@ -1146,10 +1146,17 @@ gem 'other', version https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_installer.rb#L1146
     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 https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_installer.rb#L1169
       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

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

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