Improve testing of Ruby options

core/src/main/java/org/jruby/util/cli/ArgumentProcessor.java

@@ -619,7 +619,7 @@ private void processArgument() {
                         }
                     }
                 default:
-                    throw new MainExitException(1, "jruby: unknown option " + argument);
+                    throw new MainExitException(1, "jruby: invalid option " + argument);
             }
         }
     }

test/mri/excludes/TestRubyOptions.rb

@@ -1,33 +1,32 @@
 exclude :test_assignment_in_conditional, "line numbers don't match MRI"
+exclude :test_backtrace_limit, "needs investigation"
 exclude :test_chdir, "needs investigation"
 exclude :test_copyright, "needs investigation"
-exclude :test_cwd_encoding, "can't do chdir and env yet #5145"
 exclude :test_debug, "needs investigation"
+exclude :test_disable, "needs investigation"
 exclude :test_dump_insns_with_rflag, "MRI-specific format"
 exclude :test_dump_parsetree_with_rflag, "MRI-specific format"
 exclude :test_dump_syntax_with_rflag, "MRI-specific format"
 exclude :test_dump_yydebug_with_rflag, "MRI-specific format"
 exclude :test_encoding, "needs investigation"
 exclude :test_eval, "needs investigation"
 exclude :test_flag_in_shebang, "unreliable with our bash script"
+exclude :test_frozen_string_literal, "needs investigation"
 exclude :test_frozen_string_literal_debug, "needs investigation #4303"
-exclude :test_indentation_check, "needs investigation"
+exclude :test_indentation_check, "hangs"
 exclude :test_invalid_option, "needs investigation"
 exclude :test_kanji, "needs investigation"
 exclude :test_notfound, "needs investigation"
 exclude :test_program_name, "needs investigation"
 exclude :test_require, "needs investigation"
 exclude :test_rubyopt, "needs investigation"
-exclude :test_safe_level, "needs investigation"
-exclude :test_script_from_stdin, "uses io/console in ways we don't support yet"
 exclude :test_script_is_directory, "uses io/console in ways we don't support yet"
 exclude :test_search, "passes independently but fails in suite"
 exclude :test_segv_loaded_features, "needs investigation"
 exclude :test_segv_setproctitle, "needs investigation"
 exclude :test_segv_test, "needs investigation"
 exclude :test_separator, "needs investigation"
 exclude :test_sflag, "needs investigation"
-exclude :test_shadowing_variable, "needs investigation"
 exclude :test_shebang, "needs investigation"
 exclude :test_unmatching_glob, "needs investigation"
 exclude :test_unused_variable, "needs investigation"

test/mri/ruby/test_rubyoptions.rb

@@ -128,7 +128,7 @@ def test_debug
     case RUBY_ENGINE
     when 'jruby'
       /^jruby #{q[RUBY_ENGINE_VERSION]} \(#{q[RUBY_VERSION]}\).*? \[#{
-        q[RbConfig::CONFIG["host_os"]]}-#{q[RbConfig::CONFIG["host_cpu"]]}\]$/
+        q[RbConfig::CONFIG["host_cpu"]]}-#{q[RbConfig::CONFIG["host_os"]]}\]$/
     else
       /^ruby #{q[RUBY_VERSION]}(?:[p ]|dev|rc).*? \[#{q[RUBY_PLATFORM]}\]$/
     end
@@ -224,6 +224,7 @@ def test_version
 
     return if RbConfig::CONFIG["MJIT_SUPPORT"] == 'no'
     return if yjit_force_enabled?
+    return if RUBY_ENGINE != 'ruby'
 
     [
       %w(--version --mjit --disable=mjit),