Fix running MRI C extension and C-API tests in CI, auto mx sforceimports

PullRequest: truffleruby/657

Author: eregon

mx.truffleruby/mx_truffleruby.py

@@ -122,7 +122,7 @@ def ruby_testdownstream_sulong(args):
     jt('test', 'specs', ':capi')
     jt('test', 'specs', ':truffle_capi')
     jt('test', 'specs', ':library_cext')
-    jt('test', 'mri', '--cext')
+    jt('test', 'mri', '--all-sulong')
     jt('test', 'cexts')
     jt('test', 'bundle')
 

test/mri/sulong.exclude renamed to test/mri/capi_tests.list

@@ -69,38 +69,4 @@ cext-ruby/wait_for_single_fd/test_wait_for_single_fd.rb
 cext-ruby/win32/test_console_attr.rb
 cext-ruby/win32/test_dln.rb
 cext-ruby/win32/test_fd_setsize.rb
-etc/test_etc.rb
-nkf/test_kconv.rb
-nkf/test_nkf.rb
-openssl/test_asn1.rb
-openssl/test_bn.rb
-openssl/test_buffering.rb
-openssl/test_cipher.rb
-openssl/test_config.rb
-openssl/test_digest.rb
-openssl/test_engine.rb
-openssl/test_fips.rb
-openssl/test_hmac.rb
-openssl/test_ns_spki.rb
-openssl/test_ocsp.rb
-openssl/test_pair.rb
-openssl/test_partial_record_read.rb
-openssl/test_pkcs12.rb
-openssl/test_pkcs5.rb
-openssl/test_pkcs7.rb
-openssl/test_pkey_dh.rb
-openssl/test_pkey_dsa.rb
-openssl/test_pkey_ec.rb
-openssl/test_pkey_rsa.rb
-openssl/test_ssl.rb
-openssl/test_ssl_session.rb
-openssl/test_x509cert.rb
-openssl/test_x509crl.rb
-openssl/test_x509ext.rb
-openssl/test_x509name.rb
-openssl/test_x509req.rb
-openssl/test_x509store.rb
 ruby/test_file_exhaustive.rb
-syslog/test_syslog_logger.rb
-test_syslog.rb
-zlib/test_zlib.rb

test/mri/excludes/TestFileExhaustive.rb

@@ -11,3 +11,5 @@
 exclude :test_expand_path_memsize, "needs investigation"
 exclude :test_lchmod, "needs investigation"
 exclude :test_test, "needs investigation"
+exclude :test_expand_path, "needs investigation"
+exclude :test_expand_path_for_existent_username, "needs investigation"

tool/jt.rb

@@ -21,8 +21,6 @@
 require 'pathname'
 
 TRUFFLERUBY_DIR = File.expand_path('../..', File.realpath(__FILE__))
-MRI_TEST_CEXT_DIR = "#{TRUFFLERUBY_DIR}/test/mri/tests/cext-c"
-MRI_TEST_CEXT_LIB_DIR = "#{TRUFFLERUBY_DIR}/.ext/c"
 PROFILES_DIR = "#{TRUFFLERUBY_DIR}/profiles"
 
 TRUFFLERUBY_GEM_TEST_PACK_VERSION = "8b57f6022f0fa17ace7c8d2a3af730357715e0a2"
@@ -52,29 +50,47 @@
 
 require "#{TRUFFLERUBY_DIR}/lib/truffle/truffle/openssl-prefix.rb"
 
+MRI_TEST_RELATIVE_PREFIX = "test/mri/tests"
+MRI_TEST_PREFIX = "#{TRUFFLERUBY_DIR}/#{MRI_TEST_RELATIVE_PREFIX}"
+MRI_TEST_CEXT_DIR = "#{MRI_TEST_PREFIX}/cext-c"
+MRI_TEST_CEXT_LIB_DIR = "#{TRUFFLERUBY_DIR}/.ext/c"
+
+# A list of MRI C API tests we can load. Tests that do not load at all are in failing.exclude.
+MRI_TEST_CAPI_TESTS = File.readlines("#{TRUFFLERUBY_DIR}/test/mri/capi_tests.list").map(&:chomp)
+
 MRI_TEST_MODULES = {
-    '--no-sulong' => {
-        help: 'exclude all tests requiring Sulong',
-        exclude: "#{TRUFFLERUBY_DIR}/test/mri/sulong.exclude"
-    },
     '--openssl' => {
         help: 'include only openssl tests',
-        include: openssl = ["#{TRUFFLERUBY_DIR}/test/mri/tests/openssl/test_*.rb"],
+        include: openssl = ["openssl/test_*.rb"],
     },
     '--syslog' => {
         help: 'include only syslog tests',
         include: syslog = [
-            "#{TRUFFLERUBY_DIR}/test/mri/tests/test_syslog.rb",
-            "#{TRUFFLERUBY_DIR}/test/mri/tests/syslog/test_syslog_logger.rb"
+            "test_syslog.rb",
+            "syslog/test_syslog_logger.rb"
         ]
     },
-    '--cext' => {
-        help: 'include only tests requiring Sulong',
-        include: openssl + syslog + [
-            "#{TRUFFLERUBY_DIR}/test/mri/tests/cext-ruby/**/test_*.rb",
-            "#{TRUFFLERUBY_DIR}/test/mri/tests/etc/test_etc.rb",
+    '--cexts' => {
+        help: 'run all MRI tests testing C extensions',
+        include: cexts = openssl + syslog + [
+            "etc/test_etc.rb",
+            "nkf/test_kconv.rb",
+            "nkf/test_nkf.rb",
+            "zlib/test_zlib.rb",
         ]
-    }
+    },
+    '--capi' => {
+      help: 'run all C-API MRI tests',
+      include: capi = MRI_TEST_CAPI_TESTS,
+    },
+    '--all-sulong' => {
+        help: 'run all tests requiring Sulong (C exts and C API)',
+        include: all_sulong = cexts + capi
+    },
+    '--no-sulong' => {
+        help: 'exclude all tests requiring Sulong',
+        exclude: all_sulong
+    },
 }
 
 SUBPROCESSES = []
@@ -970,55 +986,55 @@ def test_mri(*args)
     end
 
     mri_args = []
-    prefix = "#{TRUFFLERUBY_DIR}/test/mri/tests/"
-    exclusions = ["#{TRUFFLERUBY_DIR}/test/mri/failing.exclude"]
+    excluded_files = File.readlines("#{TRUFFLERUBY_DIR}/test/mri/failing.exclude").
+      map { |line| line.gsub(/#.*/, '').strip }.reject(&:empty?)
     patterns = []
 
     args.each do |arg|
       test_module = MRI_TEST_MODULES[arg]
       if test_module
         patterns.push(*test_module[:include])
-        exclusions.push(*test_module[:exclude])
+        excluded_files.push(*test_module[:exclude])
       elsif arg.start_with?('-')
         mri_args.push arg
       else
         patterns.push arg
       end
     end
 
-    patterns.push "#{TRUFFLERUBY_DIR}/test/mri/tests/**/test_*.rb" if patterns.empty?
-
-    excluded_files = exclusions.
-        flat_map { |f| File.readlines(f) }.
-        map { |l| l.gsub(/#.*/, '').strip }.
-        reject(&:empty?)
+    patterns.push "#{MRI_TEST_PREFIX}/**/test_*.rb" if patterns.empty?
 
     files_to_run = patterns.flat_map do |pattern|
-      Dir.glob(pattern).map do |path|
-        expanded_path = File.expand_path path
-        raise 'pattern does not match test files' unless expanded_path.start_with?(prefix)
-        expanded_path[prefix.size..-1]
-      end.reject do |path|
-        path.empty?
+      if pattern.start_with?(MRI_TEST_RELATIVE_PREFIX)
+        pattern = "#{TRUFFLERUBY_DIR}/#{pattern}"
+      elsif !pattern.start_with?(MRI_TEST_PREFIX)
+        pattern = "#{MRI_TEST_PREFIX}/#{pattern}"
       end
-    end.sort - excluded_files
+      glob = Dir.glob(pattern)
+      abort "pattern #{pattern} matched no files" if glob.empty?
+      glob.map { |path| mri_test_name(path) }
+    end.sort
+    files_to_run -= excluded_files
 
     run_mri_tests(mri_args, files_to_run, runner_args, use_exec: true)
   end
   private :test_mri
 
+  def mri_test_name(test)
+    prefix = "#{MRI_TEST_RELATIVE_PREFIX}/"
+    abs_prefix = "#{MRI_TEST_PREFIX}/"
+    if test.start_with?(prefix)
+      test[prefix.size..-1]
+    elsif test.start_with?(abs_prefix)
+      test[abs_prefix.size..-1]
+    else
+      test
+    end
+  end
+  private :mri_test_name
+
   def run_mri_tests(extra_args, test_files, runner_args, run_options)
-    prefix = "test/mri/tests/"
-    abs_prefix = "#{TRUFFLERUBY_DIR}/#{prefix}"
-    test_files = test_files.map { |file|
-      if file.start_with?(prefix)
-        file[prefix.size..-1]
-      elsif file.start_with?(abs_prefix)
-        file[abs_prefix.size..-1]
-      else
-        file
-      end
-    }
+    test_files = test_files.map { |file| mri_test_name(file) }
 
     truffle_args = []
     if !extra_args.include?('--native')
@@ -1027,7 +1043,7 @@ def run_mri_tests(extra_args, test_files, runner_args, run_options)
 
     env_vars = {
       "EXCLUDES" => "test/mri/excludes",
-      "RUBYGEMS_TEST_PATH" => "#{TRUFFLERUBY_DIR}/test/mri/tests",
+      "RUBYGEMS_TEST_PATH" => MRI_TEST_PREFIX,
       "RUBYOPT" => [*ENV['RUBYOPT'], '--disable-gems'].join(' '),
       "TRUFFLERUBY_RESILIENT_GEM_HOME" => nil,
     }
@@ -1043,7 +1059,7 @@ def run_mri_tests(extra_args, test_files, runner_args, run_options)
     cext_tests.each do |test|
       puts
       puts test
-      test_path = "#{TRUFFLERUBY_DIR}/test/mri/tests/#{test}"
+      test_path = "#{MRI_TEST_PREFIX}/#{test}"
       match = File.read(test_path).match(/\brequire ['"]c\/(.*?)["']/)
       if match
         cext_name = match[1]
@@ -1935,6 +1951,8 @@ def install_graal(*options)
   end
 
   def build_graalvm(*options)
+    mx('-p', TRUFFLERUBY_DIR, 'sforceimports') unless ci?
+
     java_home = ci? ? nil : ENV["JVMCI_HOME"] || install_jvmci
     mx_args = ['-p', TRUFFLERUBY_DIR, '--dynamicimports', '/vm']