summaryrefslogtreecommitdiff
path: root/test/mkmf
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-30 00:57:24 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-30 00:57:24 +0000
commit8b7ecdc11e1569e8e2cea4842156e419977ff16e (patch)
treef6a96b258cf9f4035eecda929965c0e770d99043 /test/mkmf
parent434a5f93adc435207aa0c2074558646753766a4d (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/mkmf')
-rw-r--r--test/mkmf/base.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/mkmf/base.rb b/test/mkmf/base.rb
index a9d3aec..54f2e7a 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)
}