Make jt -u ruby test mri work

Author: eregon

test/mri/tests/lib/minitest/unit.rb

@@ -3,7 +3,7 @@
 
 require "optparse"
 require "rbconfig"
-require "leakchecker" unless defined?(::TruffleRuby)
+# require "leakchecker" # TruffleRuby: LeakChecker removed to avoid interferences
 
 ##
 # Minimal (mostly drop-in) replacement for test-unit.
@@ -939,7 +939,7 @@ def _run_suite suite, type
         filter === m || filter === "#{suite}##{m}"
       }
 
-      leakchecker = LeakChecker.new unless defined?(::TruffleRuby)
+      # leakchecker = LeakChecker.new # TruffleRuby: LeakChecker removed to avoid interferences
 
       continuation = proc do
         assertions = filtered_test_methods.map { |method|
@@ -957,7 +957,7 @@ def _run_suite suite, type
           $stdout.flush
 
           unless defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? # compiler process is wrongly considered as leak
-            leakchecker.check("#{inst.class}\##{inst.__name__}") unless defined?(::TruffleRuby)
+            # leakchecker.check("#{inst.class}\##{inst.__name__}") # TruffleRuby: LeakChecker removed to avoid interferences
           end
 
           inst._assertions

test/mri/tests/runner.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 require 'rbconfig'
 
-if defined?(::TruffleRuby)
-  $LOAD_PATH.unshift File.expand_path("lib", __dir__)
-else
-  $LOAD_PATH.unshift File.expand_path("../lib", __dir__)
-end
+# TruffleRuby: adapt test lib path
+$LOAD_PATH.unshift File.expand_path("lib", __dir__)
+# $LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 
 require 'test/unit'