nobu	2009-08-06 13:14:50 +0900 (Thu, 06 Aug 2009)

  New Revision: 24419

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

  Log:
    * test/mkmf/base.rb: split from test_sizeof.rb.

  Added files:
    trunk/test/mkmf/base.rb
  Modified files:
    trunk/test/mkmf/test_sizeof.rb

Index: test/mkmf/test_sizeof.rb
===================================================================
--- test/mkmf/test_sizeof.rb	(revision 24418)
+++ test/mkmf/test_sizeof.rb	(revision 24419)
@@ -1,27 +1,14 @@
-require 'test/unit'
-require 'mkmf'
-require 'tmpdir'
+require_relative 'base'
 
-$extout = '$(topdir)/'+RbConfig::CONFIG["EXTOUT"]
-RbConfig::CONFIG['topdir'] = CONFIG['topdir'] = File.expand_path(CONFIG['topdir'])
-RbConfig::CONFIG["extout"] = CONFIG["extout"] = $extout
-$extout_prefix = "$(extout)$(target_prefix)/"
+module TestMkmf
+  class TestSizeof < Test::Unit::TestCase
+    include TestMkmf
 
-class TestMkmf < Test::Unit::TestCase
-  def setup
-    @tmpdir = Dir.mktmpdir
-    @mkmfobj = Object.new
-  end
-  def mkmf(*args, &block)
-    @mkmfobj.instance_eval(*args, &block)
-  end
-
-  def test_sizeof
-    Dir.chdir(@tmpdir) do
+    def test_sizeof
       open("confdefs.h", "w") {|f|
         f.puts "typedef struct {char x;} test1_t;"
       }
-      mkmf {check_sizeof("test1_t", "confdefs.h")} rescue puts File.read("mkmf.log")
+      assert_equal(1, mkmf {size = check_sizeof("test1_t", "confdefs.h")})
     end
   end
 end
Index: test/mkmf/base.rb
===================================================================
--- test/mkmf/base.rb	(revision 0)
+++ test/mkmf/base.rb	(revision 24419)
@@ -0,0 +1,28 @@
+require 'test/unit'
+require 'mkmf'
+require 'tmpdir'
+
+$extout = '$(topdir)/'+RbConfig::CONFIG["EXTOUT"]
+RbConfig::CONFIG['topdir'] = CONFIG['topdir'] = File.expand_path(CONFIG['topdir'])
+RbConfig::CONFIG["extout"] = CONFIG["extout"] = $extout
+RbConfig::CONFIG["cppflags"] << " -I."
+CONFIG["cppflags"] << " -I."
+$extout_prefix = "$(extout)$(target_prefix)/"
+
+module TestMkmf
+  def setup
+    @tmpdir = Dir.mktmpdir
+    @curdir = Dir.pwd
+    @mkmfobj = Object.new
+    Dir.chdir(@tmpdir)
+  end
+
+  def teardown
+    Dir.chdir(@curdir)
+    FileUtils.rm_rf(@tmpdir)
+  end
+
+  def mkmf(*args, &block)
+    @mkmfobj.instance_eval(*args, &block)
+  end
+end

Property changes on: test/mkmf/base.rb
___________________________________________________________________
Name: svn:eol-style
   + LF
Name: svn:keywords
   + Author Id Revision


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