From 8b7ecdc11e1569e8e2cea4842156e419977ff16e Mon Sep 17 00:00:00 2001 From: drbrain Date: Wed, 30 Nov 2011 00:57:24 +0000 Subject: * lib/mkmf.rb: Use MakeMakefile's rm_f to avoid conflict with Rake or FileUtils. * test/ruby/test_module.rb: Hide MakeMakefile's inclusion in Object git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/mkmf/base.rb | 4 ++-- test/ruby/test_module.rb | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'test') diff --git a/test/mkmf/base.rb b/test/mkmf/base.rb index a9d3aec338..54f2e7a6be 100644 --- a/test/mkmf/base.rb +++ b/test/mkmf/base.rb @@ -78,7 +78,7 @@ class TestMkmf < Test::Unit::TestCase remove_const(:MAKEFILE_CONFIG) const_set(:MAKEFILE_CONFIG, mkconfig) } - Object.class_eval { + MakeMakefile.class_eval { remove_const(:CONFIG) const_set(:CONFIG, mkconfig) } @@ -101,7 +101,7 @@ class TestMkmf < Test::Unit::TestCase remove_const(:MAKEFILE_CONFIG) const_set(:MAKEFILE_CONFIG, mkconfig0) } - Object.class_eval { + MakeMakefile.class_eval { remove_const(:CONFIG) const_set(:CONFIG, mkconfig0) } diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index b3b3f676c2..e44ae85680 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -83,6 +83,10 @@ class TestModule < Test::Unit::TestCase list.reject {|c| c.to_s.start_with?("MiniTest") } end + def remove_mkmf_mixins(list) + list.reject {|c| c.to_s.start_with?("MakeMakefile") } + end + module Mixin MIXIN = 1 def mixin @@ -221,9 +225,9 @@ class TestModule < Test::Unit::TestCase assert_equal([Mixin], Mixin.ancestors) assert_equal([Object, Kernel, BasicObject], - remove_minitest_mixins(remove_rake_mixins(remove_json_mixins(remove_pp_mixins(Object.ancestors))))) + remove_mkmf_mixins(remove_minitest_mixins(remove_rake_mixins(remove_json_mixins(remove_pp_mixins(Object.ancestors)))))) assert_equal([String, Comparable, Object, Kernel, BasicObject], - remove_minitest_mixins(remove_rake_mixins(remove_json_mixins(remove_pp_mixins(String.ancestors))))) + remove_mkmf_mixins(remove_minitest_mixins(remove_rake_mixins(remove_json_mixins(remove_pp_mixins(String.ancestors)))))) end CLASS_EVAL = 2 @@ -281,9 +285,9 @@ class TestModule < Test::Unit::TestCase assert_equal([], Mixin.included_modules) assert_equal([Mixin], User.included_modules) assert_equal([Kernel], - remove_minitest_mixins(remove_rake_mixins(remove_json_mixins(remove_pp_mixins(Object.included_modules))))) + remove_mkmf_mixins(remove_minitest_mixins(remove_rake_mixins(remove_json_mixins(remove_pp_mixins(Object.included_modules)))))) assert_equal([Comparable, Kernel], - remove_minitest_mixins(remove_rake_mixins(remove_json_mixins(remove_pp_mixins(String.included_modules))))) + remove_mkmf_mixins(remove_minitest_mixins(remove_rake_mixins(remove_json_mixins(remove_pp_mixins(String.included_modules)))))) end def test_instance_methods -- cgit v1.2.3