diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-11-30 00:57:24 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-11-30 00:57:24 +0000 |
| commit | 8b7ecdc11e1569e8e2cea4842156e419977ff16e (patch) | |
| tree | f6a96b258cf9f4035eecda929965c0e770d99043 /test/ruby/test_module.rb | |
| parent | 434a5f93adc435207aa0c2074558646753766a4d (diff) | |
* 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
Diffstat (limited to 'test/ruby/test_module.rb')
| -rw-r--r-- | test/ruby/test_module.rb | 12 |
1 files changed, 8 insertions, 4 deletions
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 |