nobu	2012-12-05 11:37:41 +0900 (Wed, 05 Dec 2012)

  New Revision: 38199

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

  Log:
    mkmf.rb: different strings from conflict markers
    
    * lib/mkmf.rb (MakeMakefile#macro_defined?): use clearly different
      strings from conflict markers.

  Added files:
    trunk/test/mkmf/test_have_macro.rb
  Modified files:
    trunk/ChangeLog
    trunk/lib/mkmf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38198)
+++ ChangeLog	(revision 38199)
@@ -1,3 +1,8 @@
+Wed Dec  5 11:37:37 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (MakeMakefile#macro_defined?): use clearly different
+	  strings from conflict markers.
+
 Wed Dec  5 04:25:00 2012  Zachary Scott  <zachary@z...>
 
 	* lib/README: Add rdoc modeline directive and formatting libs
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 38198)
+++ lib/mkmf.rb	(revision 38199)
@@ -757,7 +757,7 @@
 /*top*/
 #ifndef #{macro}
 # error
->>>>>> #{macro} undefined <<<<<<
+|:/ === #{macro} undefined === /:|
 #endif
 SRC
   end
Index: test/mkmf/test_have_macro.rb
===================================================================
--- test/mkmf/test_have_macro.rb	(revision 0)
+++ test/mkmf/test_have_macro.rb	(revision 38199)
@@ -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

Property changes on: test/mkmf/test_have_macro.rb
___________________________________________________________________
Added: svn:eol-style
   + LF


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