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

ruby-changes:40228

From: naruse <ko1@a...>
Date: Wed, 28 Oct 2015 05:18:34 +0900 (JST)
Subject: [ruby-changes:40228] naruse:r52309 (trunk): ENV['MAKE'] is prior than ENV['make']

naruse	2015-10-28 05:18:15 +0900 (Wed, 28 Oct 2015)

  New Revision: 52309

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

  Log:
    ENV['MAKE'] is prior than ENV['make']
    
    some CI uses ENV['MAKE'] to specify gmake

  Modified files:
    trunk/test/rubygems/test_gem_ext_ext_conf_builder.rb
Index: test/rubygems/test_gem_ext_ext_conf_builder.rb
===================================================================
--- test/rubygems/test_gem_ext_ext_conf_builder.rb	(revision 52308)
+++ test/rubygems/test_gem_ext_ext_conf_builder.rb	(revision 52309)
@@ -64,8 +64,8 @@ class TestGemExtExtConfBuilder < Gem::Te https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_ext_ext_conf_builder.rb#L64
   end
 
   def test_class_build_env_make
-    env_make = ENV.delete 'make'
-    ENV['make'] = 'anothermake'
+    env_make = ENV.delete 'MAKE'
+    ENV['MAKE'] = 'anothermake'
 
     configure_args '' do
       File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
@@ -84,7 +84,7 @@ class TestGemExtExtConfBuilder < Gem::Te https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_ext_ext_conf_builder.rb#L84
       assert_contains_make_command 'clean', output[4]
     end
   ensure
-    ENV['make'] = env_make
+    ENV['MAKE'] = env_make
   end
 
   def test_class_build_extconf_fail

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

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