From af9fa16c96284f61b595a8f994926533fd51fd3b Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@gmail.com>
Date: Thu, 25 Aug 2022 11:31:16 -0700
Subject: Make sure super is called and fix teardown

---
 test/mkmf/base.rb          | 1 +
 test/mkmf/test_constant.rb | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'test/mkmf')

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
-- 
cgit v1.2.3