Make sure super is called and fix teardown

2 files changed, 3 insertions, 0 deletions

diff --git a/test/mkmf/base.rb b/test/mkmf/base.rb
index e097c396d6..ec42bca100 100644
--- a/test/mkmf/base.rb
+++ b/test/mkmf/base.rb
@@ -106,6 +106,7 @@ class TestMkmf < Test::Unit::TestCase
     end
 
     def teardown
+      return if @omitted
       rbconfig0 = @rbconfig
       mkconfig0 = @mkconfig
       RbConfig.module_eval {
diff --git a/test/mkmf/test_constant.rb b/test/mkmf/test_constant.rb
index e12250d0a2..f22b82ff95 100644
--- a/test/mkmf/test_constant.rb
+++ b/test/mkmf/test_constant.rb
@@ -4,8 +4,10 @@ require_relative 'base'
 class TestMkmfTryConstant < TestMkmf
   def setup
     if ENV.key?('APPVEYOR')
+      @omitted = true
       omit 'This test fails too often on AppVeyor'
     end
+    super
   end
 
   def test_simple