Fix running MRI C extension and C-API tests in CI

* Improve naming and make it easy to run just C exts or just C API MRI tests.
* Avoid duplication, and do not name it "exclude" when it's files we
  want to run.

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

tool/jt.rb

@@ -52,14 +52,15 @@
 
 require "#{TRUFFLERUBY_DIR}/lib/truffle/truffle/openssl-prefix.rb"
 
+# A list of MRI C API tests we can run. Files that do not load at all are in failing.exclude.
+MRI_TEST_CAPI_TESTS = File.readlines("#{TRUFFLERUBY_DIR}/test/mri/capi_tests.list").map { |line|
+  "#{TRUFFLERUBY_DIR}/test/mri/tests/#{line.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 = Dir["#{TRUFFLERUBY_DIR}/test/mri/tests/openssl/test_*.rb"].sort,
     },
     '--syslog' => {
         help: 'include only syslog tests',
@@ -68,14 +69,27 @@
             "#{TRUFFLERUBY_DIR}/test/mri/tests/syslog/test_syslog_logger.rb"
         ]
     },
-    '--cext' => {
-        help: 'include only tests requiring Sulong',
-        include: openssl + syslog + [
-            "#{TRUFFLERUBY_DIR}/test/mri/tests/cext-ruby/**/test_*.rb",
+    '--cexts' => {
+        help: 'run all MRI tests testing C extensions',
+        include: cexts = openssl + syslog + [
             "#{TRUFFLERUBY_DIR}/test/mri/tests/etc/test_etc.rb",
+            "#{TRUFFLERUBY_DIR}/test/mri/tests/nkf/test_kconv.rb",
+            "#{TRUFFLERUBY_DIR}/test/mri/tests/nkf/test_nkf.rb",
             "#{TRUFFLERUBY_DIR}/test/mri/tests/zlib/test_zlib.rb",
         ]
-    }
+    },
+    '--capi' => {
+      help: 'run all C-API MRI tests',
+      include: MRI_TEST_CAPI_TESTS,
+    },
+    '--all-sulong' => {
+        help: 'run all tests requiring Sulong (C exts and C API)',
+        include: all_sulong = cexts + MRI_TEST_CAPI_TESTS
+    },
+    '--no-sulong' => {
+        help: 'exclude all tests requiring Sulong',
+        exclude: all_sulong
+    },
 }
 
 SUBPROCESSES = []
@@ -972,14 +986,15 @@ def test_mri(*args)
 
     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
@@ -989,11 +1004,6 @@ def test_mri(*args)
 
     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?)
-
     files_to_run = patterns.flat_map do |pattern|
       Dir.glob(pattern).map do |path|
         expanded_path = File.expand_path path