Avoid defining the same test class in multiple files

Should fix issues with parallel testing sometimes not running all
tests.

This should be viewed skipping whitespace changes.

Fixes [Bug #18731]

1 files changed, 23 insertions, 25 deletions

diff --git a/test/mkmf/test_convertible.rb b/test/mkmf/test_convertible.rb
index 1baf892842..d65db4265b 100644
--- a/test/mkmf/test_convertible.rb
+++ b/test/mkmf/test_convertible.rb
@@ -1,35 +1,33 @@
 # frozen_string_literal: false
 require_relative 'base'
 
-class TestMkmf
-  class TestConvertible < TestMkmf
-    def test_typeof_builtin
-      ["", ["signed ", ""], "unsigned "].each do |signed, prefix|
-        %w[short int long].each do |type|
-          assert_equal((prefix || signed)+type,
-                       mkmf {convertible_int(signed+type)}, MKMFLOG)
-        end
+class TestMkmfConvertible < TestMkmf
+  def test_typeof_builtin
+    ["", ["signed ", ""], "unsigned "].each do |signed, prefix|
+      %w[short int long].each do |type|
+        assert_equal((prefix || signed)+type,
+                     mkmf {convertible_int(signed+type)}, MKMFLOG)
       end
     end
+  end
 
-    def test_typeof_typedef
-      ["", ["signed ", ""], "unsigned "].each do |signed, prefix|
-        %w[short int long].each do |type|
-          open("confdefs.h", "w") {|f|
-            f.puts "typedef #{signed}#{type} test1_t;"
-          }
-          $defs.clear
-          assert_equal((prefix || signed)+type,
-                       mkmf {convertible_int("test1_t", "confdefs.h")}, MKMFLOG)
-          (u = signed[/^u/]) and u.upcase!
-          assert_include($defs, "-DTYPEOF_TEST1_T="+"#{prefix||signed}#{type}".quote)
-          assert_include($defs, "-DPRI_TEST1T_PREFIX=PRI_#{type.upcase}_PREFIX")
-          assert_include($defs, "-DTEST1T2NUM=#{u}#{type.upcase}2NUM")
-          assert_include($defs, "-DNUM2TEST1T=NUM2#{u}#{type.upcase}")
-        end
+  def test_typeof_typedef
+    ["", ["signed ", ""], "unsigned "].each do |signed, prefix|
+      %w[short int long].each do |type|
+        open("confdefs.h", "w") {|f|
+          f.puts "typedef #{signed}#{type} test1_t;"
+        }
+        $defs.clear
+        assert_equal((prefix || signed)+type,
+                     mkmf {convertible_int("test1_t", "confdefs.h")}, MKMFLOG)
+        (u = signed[/^u/]) and u.upcase!
+        assert_include($defs, "-DTYPEOF_TEST1_T="+"#{prefix||signed}#{type}".quote)
+        assert_include($defs, "-DPRI_TEST1T_PREFIX=PRI_#{type.upcase}_PREFIX")
+        assert_include($defs, "-DTEST1T2NUM=#{u}#{type.upcase}2NUM")
+        assert_include($defs, "-DNUM2TEST1T=NUM2#{u}#{type.upcase}")
       end
-    ensure
-      File.unlink("confdefs.h")
     end
+  ensure
+    File.unlink("confdefs.h")
   end
 end