test: ensure GC-ing closures

kou · kou · commit 1343ac7a9567 · 2022-09-10T00:01:23.000+09:00
GitHub: fix GH-102 We can't use Fiddle::Closure before we fork the process. If we do it, the process may be crashed with SELinux. See #102 (comment) for details. Reported by Vít Ondruch. Thanks!!!
diff --git a/test/fiddle/test_closure.rb b/test/fiddle/test_closure.rb
@@ -6,6 +6,14 @@
 
 module Fiddle
   class TestClosure < Fiddle::TestCase
+    def teardown
+      super
+      # Ensure freeing all closures.
+      # See https://github.com/ruby/fiddle/issues/102#issuecomment-1241763091 .
+      GC.start
+      assert_equal(0, ObjectSpace.each_object(Fiddle::Closure) {})
+    end
+
     def test_argument_errors
       assert_raise(TypeError) do
         Closure.new(TYPE_INT, TYPE_INT)
@@ -103,6 +111,9 @@ def test_memsize
           func = Function.new(clos, [t], t)
           assert_equal(v, func.call(v))
           assert_equal(arg, v, n)
+        ensure
+          clos = nil
+          func = nil
         end
       end
     end
diff --git a/test/fiddle/test_func.rb b/test/fiddle/test_func.rb
@@ -79,6 +79,12 @@ def call(x, y)
         qsort.call(buff, buff.size, 1, cb)
       end
       assert_equal("1349", buff, bug4929)
+    ensure
+      # Ensure freeing all closures.
+      # See https://github.com/ruby/fiddle/issues/102#issuecomment-1241763091 .
+      cb = nil
+      GC.start
+      assert_equal(0, ObjectSpace.each_object(Fiddle::Closure) {})
     end
 
     def test_snprintf
diff --git a/test/fiddle/test_function.rb b/test/fiddle/test_function.rb
@@ -15,6 +15,13 @@ def setup
       end
     end
 
+    def teardown
+      # Ensure freeing all closures.
+      # See https://github.com/ruby/fiddle/issues/102#issuecomment-1241763091 .
+      GC.start
+      assert_equal(0, ObjectSpace.each_object(Fiddle::Closure) {})
+    end
+
     def test_default_abi
       func = Function.new(@libm['sin'], [TYPE_DOUBLE], TYPE_DOUBLE)
       assert_equal Function::DEFAULT, func.abi
diff --git a/test/fiddle/test_import.rb b/test/fiddle/test_import.rb
@@ -22,7 +22,6 @@ module LIBC
     extern "int fprintf(FILE*, char*)" rescue nil
     extern "int gettimeofday(timeval*, timezone*)" rescue nil
 
-    BoundQsortCallback = bind("void *bound_qsort_callback(void*, void*)"){|ptr1,ptr2| ptr1[0] <=> ptr2[0]}
     Timeval = struct [
       "long tv_sec",
       "long tv_usec",
@@ -59,11 +58,6 @@ module LIBC
         ]
       }
     ]
-
-    CallCallback = bind("void call_callback(void*, void*)"){ | ptr1, ptr2|
-      f = Function.new(ptr1.to_i, [TYPE_VOIDP], TYPE_VOID)
-      f.call(ptr2)
-    }
   end
 
   class TestImport < TestCase

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ module LIBC`
`22`	`22`	`extern "int fprintf(FILE, char)" rescue nil`
`23`	`23`	`extern "int gettimeofday(timeval, timezone)" rescue nil`
`24`	`24`
`25`		`- BoundQsortCallback = bind("void bound_qsort_callback(void, void*)"){\|ptr1,ptr2\| ptr1[0] <=> ptr2[0]}`
`26`	`25`	`Timeval = struct [`
`27`	`26`	`"long tv_sec",`
`28`	`27`	`"long tv_usec",`
`@@ -59,11 +58,6 @@ module LIBC`
`59`	`58`	`]`
`60`	`59`	`}`
`61`	`60`	`]`
`62`		`-`
`63`		`- CallCallback = bind("void call_callback(void, void)"){ \| ptr1, ptr2\|`
`64`		`- f = Function.new(ptr1.to_i, [TYPE_VOIDP], TYPE_VOID)`
`65`		`- f.call(ptr2)`
`66`		`- }`
`67`	`61`	`end`
`68`	`62`
`69`	`63`	`class TestImport < TestCase`