nobu	2010-12-10 18:11:10 +0900 (Fri, 10 Dec 2010)

  New Revision: 30159

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

  Log:
    * lib/mkmf.rb (Logging.log_close): separate from Logging.logfile.
    * test/mkmf/base.rb (TestMkmf::MKMFLOG): show mkmf.log at failures.
    * test/mkmf/base.rb (TestMkmf#teardown): close log file for each tests.

  Modified files:
    trunk/ChangeLog
    trunk/lib/mkmf.rb
    trunk/test/mkmf/base.rb
    trunk/test/mkmf/test_convertible.rb
    trunk/test/mkmf/test_sizeof.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30158)
+++ ChangeLog	(revision 30159)
@@ -1,3 +1,11 @@
+Fri Dec 10 18:11:08 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (Logging.log_close): separate from Logging.logfile.
+
+	* test/mkmf/base.rb (TestMkmf::MKMFLOG): show mkmf.log at failures.
+
+	* test/mkmf/base.rb (TestMkmf#teardown): close log file for each tests.
+
 Fri Dec 10 11:36:43 2010  Kazuhiro NISHIYAMA  <zn@m...>
 
 	* compile.c (enum): remove a comma at end of enumerator list.
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 30158)
+++ lib/mkmf.rb	(revision 30159)
@@ -264,6 +264,10 @@
 
   def self::logfile file
     @logfile = file
+    log_close
+  end
+
+  def self::log_close
     if @log and not @log.closed?
       @log.flush
       @log.close
Index: test/mkmf/test_sizeof.rb
===================================================================
--- test/mkmf/test_sizeof.rb	(revision 30158)
+++ test/mkmf/test_sizeof.rb	(revision 30159)
@@ -4,7 +4,7 @@
   class TestSizeof < TestMkmf
     def test_sizeof_builtin
       %w[char short int long float double void*].each do |type|
-        assert_kind_of(Integer, mkmf {check_sizeof(type)})
+        assert_kind_of(Integer, mkmf {check_sizeof(type)}, MKMFLOG)
       end
     end
 
@@ -12,7 +12,7 @@
       open("confdefs.h", "w") {|f|
         f.puts "typedef struct {char x;} test1_t;"
       }
-      assert_equal(1, mkmf {check_sizeof("test1_t", "confdefs.h")})
+      assert_equal(1, mkmf {check_sizeof("test1_t", "confdefs.h")}, MKMFLOG)
     end
   end
 end
Index: test/mkmf/base.rb
===================================================================
--- test/mkmf/base.rb	(revision 30158)
+++ test/mkmf/base.rb	(revision 30159)
@@ -9,6 +9,11 @@
 $extout_prefix = "$(extout)$(target_prefix)/"
 
 class TestMkmf < Test::Unit::TestCase
+  MKMFLOG = proc {File.read("mkmf.log") rescue ""}
+  class << MKMFLOG
+    alias to_s call
+  end
+
   def setup
     @tmpdir = Dir.mktmpdir
     @curdir = Dir.pwd
@@ -19,6 +24,7 @@
 
   def teardown
     Logging.quiet = @quiet
+    Logging.log_close
     Dir.chdir(@curdir)
     FileUtils.rm_rf(@tmpdir)
   end
Index: test/mkmf/test_convertible.rb
===================================================================
--- test/mkmf/test_convertible.rb	(revision 30158)
+++ test/mkmf/test_convertible.rb	(revision 30159)
@@ -6,7 +6,7 @@
       ["", ["signed ", ""], "unsigned "].each do |signed, prefix|
         %w[short int long].each do |type|
           assert_equal((prefix || signed)+type,
-                       mkmf {convertible_int(signed+type)})
+                       mkmf {convertible_int(signed+type)}, MKMFLOG)
         end
       end
     end
@@ -19,7 +19,7 @@
           }
           $defs.clear
           assert_equal((prefix || signed)+type,
-                       mkmf {convertible_int("test1_t", "confdefs.h")})
+                       mkmf {convertible_int("test1_t", "confdefs.h")}, MKMFLOG)
           (u = signed[/^u/]) and u.upcase!
           assert_includes($defs, "-DTYPEOF_TEST1_T="+"#{prefix||signed}#{type}".quote)
           assert_includes($defs, "-DPRI_TEST1T_PREFIX=PRI_#{type.upcase}_PREFIX")

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