diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-05 02:37:41 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-05 02:37:41 +0000 |
| commit | 1692d4933845fad2f35fd949e9473688029da00b (patch) | |
| tree | c31c016f8e991b8a736b40f6dc114ff51b64683c | |
| parent | 1d50afc2a201dbac64caed4df35b6ff44c1fc38e (diff) | |
| download | ruby-1692d4933845fad2f35fd949e9473688029da00b.tar.gz | |
mkmf.rb: different strings from conflict markers
* lib/mkmf.rb (MakeMakefile#macro_defined?): use clearly different
strings from conflict markers.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 | ||||
| -rw-r--r-- | test/mkmf/test_have_macro.rb | 35 |
3 files changed, 41 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Wed Dec 5 11:37:37 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (MakeMakefile#macro_defined?): use clearly different + strings from conflict markers. + Wed Dec 5 04:25:00 2012 Zachary Scott <zachary@zacharyscott.net> * lib/README: Add rdoc modeline directive and formatting libs diff --git a/lib/mkmf.rb b/lib/mkmf.rb index d41e0c3552..0e9d64f0d7 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -757,7 +757,7 @@ SRC /*top*/ #ifndef #{macro} # error ->>>>>> #{macro} undefined <<<<<< +|:/ === #{macro} undefined === /:| #endif SRC end diff --git a/test/mkmf/test_have_macro.rb b/test/mkmf/test_have_macro.rb new file mode 100644 index 0000000000..d070829295 --- /dev/null +++ b/test/mkmf/test_have_macro.rb @@ -0,0 +1,35 @@ +require_relative 'base' +require 'tempfile' + +class TestMkmf + class TestMacro < TestMkmf + MACRO_NAME = "RUBY_MKMFTEST_FOOBAR" + + def test_have_macro_opt + assert_equal(true, have_macro(MACRO_NAME, nil, "-D#{MACRO_NAME}"), MKMFLOG) + end + + def test_have_macro_header + Tempfile.open(%w"test_mkmf .h", ".") do |tmp| + tmp.puts("#undef #{MACRO_NAME}") + tmp.puts("#define #{MACRO_NAME} 1") + tmp.close + dir, base = File.split(tmp.path) + assert_equal(true, have_macro(MACRO_NAME, base, "-I."), MKMFLOG) + end + end + + def test_not_have_macro_opt + assert_equal(false, have_macro(MACRO_NAME, nil, "-U#{MACRO_NAME}"), MKMFLOG) + end + + def test_not_have_macro_header + Tempfile.open(%w"test_mkmf .h", ".") do |tmp| + tmp.puts("#undef #{MACRO_NAME}") + tmp.close + dir, base = File.split(tmp.path) + assert_equal(false, have_macro(MACRO_NAME, base, "-I."), MKMFLOG) + end + end + end +end |