tarui	2010-06-29 01:01:22 +0900 (Tue, 29 Jun 2010)

  New Revision: 28461

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28461

  Log:
    * test/rubygems/gemutilities.rb: check ENV['make'] for make_command.
    * test/rubygems/test_gem_ext_configure_builder.rb: use gemutilities' make_command.
    * test/rubygems/test_gem_ext_ext_conf_builder.rb: ditto.

  Modified files:
    trunk/test/rubygems/gemutilities.rb
    trunk/test/rubygems/test_gem_ext_configure_builder.rb
    trunk/test/rubygems/test_gem_ext_ext_conf_builder.rb

Index: test/rubygems/test_gem_ext_configure_builder.rb
===================================================================
--- test/rubygems/test_gem_ext_configure_builder.rb	(revision 28460)
+++ test/rubygems/test_gem_ext_configure_builder.rb	(revision 28461)
@@ -30,9 +30,9 @@
 
     assert_equal "sh ./configure --prefix=#{@dest_path}", output.shift
     assert_equal "", output.shift
-    assert_equal "make", output.shift
+    assert_equal make_command, output.shift
     assert_match(/^ok$/m, output.shift)
-    assert_equal "make install", output.shift
+    assert_equal make_command + " install", output.shift
     assert_match(/^ok$/m, output.shift)
   end
 
Index: test/rubygems/test_gem_ext_ext_conf_builder.rb
===================================================================
--- test/rubygems/test_gem_ext_ext_conf_builder.rb	(revision 28460)
+++ test/rubygems/test_gem_ext_ext_conf_builder.rb	(revision 28461)
@@ -39,14 +39,8 @@
 
     assert_match(/^#{Gem.ruby} extconf.rb/, output[0])
     assert_equal "creating Makefile\n", output[1]
-    case RUBY_PLATFORM
-    when /mswin/ then
-      assert_equal "nmake", output[2]
-      assert_equal "nmake install", output[4]
-    else
-      assert_equal "make", output[2]
-      assert_equal "make install", output[4]
-    end
+    assert_equal make_command, output[2]
+    assert_equal make_command + " install", output[4]
   end
 
   def test_class_build_extconf_fail
Index: test/rubygems/gemutilities.rb
===================================================================
--- test/rubygems/gemutilities.rb	(revision 28460)
+++ test/rubygems/gemutilities.rb	(revision 28461)
@@ -474,7 +474,7 @@
   # other platforms, including Cygwin, it will return 'make'.
   #
   def self.make_command
-    vc_windows? ? 'nmake' : 'make'
+    ENV["make"] || (vc_windows? ? 'nmake' : 'make')
   end
 
   # Returns the make command for the current platform. For versions of Ruby
@@ -482,7 +482,7 @@
   # other platforms, including Cygwin, it will return 'make'.
   #
   def make_command
-    vc_windows? ? 'nmake' : 'make'
+    ENV["make"] || (vc_windows? ? 'nmake' : 'make')
   end
 
   # Returns whether or not the nmake command could be found.

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