* test/mkmf/base.rb (TestMkmf#config_value): extract macro value from

  config.h.
* test/mkmf/test_sizeof.rb (TestMkmf::TestSizeof#test_sizeof_builtin),
 (TestMkmf::TestSizeof#test_sizeof_struct): more tests.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30161 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 35 insertions, 0 deletions

diff --git a/test/mkmf/base.rb b/test/mkmf/base.rb
index f82952d0c5..49553cf10f 100644
--- a/test/mkmf/base.rb
+++ b/test/mkmf/base.rb
@@ -39,4 +39,12 @@ class TestMkmf < Test::Unit::TestCase
   def mkmf(*args, &block)
     @mkmfobj.instance_eval(*args, &block)
   end
+
+  def config_value(name)
+    create_tmpsrc("---config-value=#{name}")
+    xpopen(cpp_command('')) do |f|
+      f.grep(/^---config-value=(.*)/) {return $1}
+    end
+    nil
+  end
 end
diff --git a/test/mkmf/test_sizeof.rb b/test/mkmf/test_sizeof.rb
index 4e3c77e8e3..30f6fd5400 100644
--- a/test/mkmf/test_sizeof.rb
+++ b/test/mkmf/test_sizeof.rb
@@ -2,10 +2,23 @@ require_relative 'base'
 
 class TestMkmf
   class TestSizeof < TestMkmf
+    def setup
+      super
+      @sizeof_short = config_value("SIZEOF_SHORT").to_i
+      @sizeof_int = config_value("SIZEOF_INT").to_i
+      @sizeof_long = config_value("SIZEOF_LONG").to_i
+      @sizeof_long_long = config_value("SIZEOF_LONG_LONG").to_i
+      @sizeof___int64 = config_value("SIZEOF___INT64").to_i
+    end
+
     def test_sizeof_builtin
       %w[char short int long float double void*].each do |type|
         assert_kind_of(Integer, mkmf {check_sizeof(type)}, MKMFLOG)
       end
+      assert_operator(@sizeof_short, :<=, @sizeof_int)
+      assert_operator(@sizeof_int, :<=, @sizeof_long)
+      assert_operator(@sizeof_long, :<=, @sizeof_long_long) unless @sizeof_long_long.zero?
+      assert_equal(8, @sizeof___int64) unless @sizeof___int64.zero?
     end
 
     def test_sizeof_struct
@@ -13,6 +26,20 @@ class TestMkmf
         f.puts "typedef struct {char x;} test1_t;"
       }
       assert_equal(1, mkmf {check_sizeof("test1_t", "confdefs.h")}, MKMFLOG)
+
+      open("confdefs.h", "w") {|f|
+        f.puts "typedef struct {char x, y;} test1_t;"
+      }
+      assert_equal(2, mkmf {check_sizeof("test1_t", "confdefs.h")}, MKMFLOG)
+
+      open("confdefs.h", "w") {|f|
+        f.puts "typedef struct {int x;} test1_t;"
+      }
+      assert_equal(@sizeof_int, mkmf {check_sizeof("test1_t", "confdefs.h")}, MKMFLOG)
+      open("confdefs.h", "w") {|f|
+        f.puts "typedef struct {int x, y;} test1_t;"
+      }
+      assert_equal(2 * @sizeof_int, mkmf {check_sizeof("test1_t", "confdefs.h")}, MKMFLOG)
     end
   end
 end