1 files changed, 33 insertions, 27 deletions
diff --git a/test/mkmf/test_constant.rb b/test/mkmf/test_constant.rb
index f5a87a1caa..f22b82ff95 100644
--- a/test/mkmf/test_constant.rb
+++ b/test/mkmf/test_constant.rb
@@ -1,38 +1,44 @@
 # frozen_string_literal: false
 require_relative 'base'
 
-class TestMkmf
-  class TestTryConstant < TestMkmf
-    def test_simple
-      assert_equal( 0, mkmf {try_constant("0")}, MKMFLOG)
-      assert_equal( 1, mkmf {try_constant("1")}, MKMFLOG)
-      assert_equal(-1, mkmf {try_constant("-1")}, MKMFLOG)
+class TestMkmfTryConstant < TestMkmf
+  def setup
+    if ENV.key?('APPVEYOR')
+      @omitted = true
+      omit 'This test fails too often on AppVeyor'
     end
+    super
+  end
 
-    def test_sizeof
-      assert_equal(config_value("SIZEOF_INT").to_i, mkmf {try_constant("sizeof(int)")}, MKMFLOG)
-      assert_equal(config_value("SIZEOF_LONG").to_i, mkmf {try_constant("sizeof(long)")}, MKMFLOG)
-      assert_equal(config_value("SIZEOF_VOIDP").to_i, mkmf {try_constant("sizeof(void*)")}, MKMFLOG)
-      assert_equal(config_value("SIZEOF_VALUE").to_i, mkmf {try_constant("sizeof(Qnil)")}, MKMFLOG)
-    end
+  def test_simple
+    assert_equal( 0, mkmf {try_constant("0")}, MKMFLOG)
+    assert_equal( 1, mkmf {try_constant("1")}, MKMFLOG)
+    assert_equal(-1, mkmf {try_constant("-1")}, MKMFLOG)
+  end
 
-    def test_long
-      sizeof_int = config_value("SIZEOF_INT").to_i
-      sizeof_long = config_value("SIZEOF_LONG").to_i
-      if sizeof_long > sizeof_int
-        type = 'long'
-      else
-        sizeof_long_long = config_value("SIZEOF_LONG_LONG").to_i
-        return if !sizeof_long_long or sizeof_long_long <= sizeof_int
-        type = 'LONG_LONG'
-      end
+  def test_sizeof
+    assert_equal(config_value("SIZEOF_INT").to_i, mkmf {try_constant("sizeof(int)")}, MKMFLOG)
+    assert_equal(config_value("SIZEOF_LONG").to_i, mkmf {try_constant("sizeof(long)")}, MKMFLOG)
+    assert_equal(config_value("SIZEOF_VOIDP").to_i, mkmf {try_constant("sizeof(void*)")}, MKMFLOG)
+    assert_equal(config_value("SIZEOF_VALUE").to_i, mkmf {try_constant("sizeof(Qnil)")}, MKMFLOG)
+  end
 
-      decl = "#define CONFTEST_VALUE (unsigned #{type})(((unsigned #{type})1)<<(CHAR_BIT*sizeof(int)))"
-      assert_operator(mkmf {try_constant("CONFTEST_VALUE", [[decl]])}, :>, 0, MKMFLOG)
+  def test_long
+    sizeof_int = config_value("SIZEOF_INT").to_i
+    sizeof_long = config_value("SIZEOF_LONG").to_i
+    if sizeof_long > sizeof_int
+      type = 'long'
+    else
+      sizeof_long_long = config_value("SIZEOF_LONG_LONG").to_i
+      return if !sizeof_long_long or sizeof_long_long <= sizeof_int
+      type = 'LONG_LONG'
     end
 
-    def test_large_unsigned
-      assert_operator(mkmf {try_constant("1U<<(CHAR_BIT*sizeof(int)-1)")}, :>, 0, MKMFLOG)
-    end
+    decl = "#define CONFTEST_VALUE (unsigned #{type})(((unsigned #{type})1)<<(CHAR_BIT*sizeof(int)))"
+    assert_operator(mkmf {try_constant("CONFTEST_VALUE", [[decl]])}, :>, 0, MKMFLOG)
+  end
+
+  def test_large_unsigned
+    assert_operator(mkmf {try_constant("1U<<(CHAR_BIT*sizeof(int)-1)")}, :>, 0, MKMFLOG)
   end
 end