jruby · Apr 25, 2018 · Apr 25, 2018 · Apr 25, 2018 · Apr 25, 2018 · Apr 25, 2018
diff --git a/core/src/main/java/org/jruby/RubyStruct.java b/core/src/main/java/org/jruby/RubyStruct.java
@@ -362,9 +362,10 @@ public IRubyObject initialize(ThreadContext context, IRubyObject[] args) {
 
         if (keywordInit.isTrue()) {
             IRubyObject maybeKwargs = ArgsUtil.getOptionsArg(runtime, args);
+            int argc = maybeKwargs.isNil() ? args.length : args.length - 1;
 
-            if (maybeKwargs.isNil())
-                throw runtime.newArgumentError("wrong number of arguments (given " + args.length + ", expected 0)");
+            if (argc >= 1)
+                throw runtime.newArgumentError("wrong number of arguments (given " + argc + ", expected 0)");
 
             RubyHash kwArgs = (RubyHash) maybeKwargs;
             RubyArray __members__ = __member__();

diff --git a/core/src/main/java/org/jruby/RubyThread.java b/core/src/main/java/org/jruby/RubyThread.java
@@ -1748,11 +1748,14 @@ public void exceptionRaised(Throwable throwable) {
 
         if (runtime.getSystemExit().isInstance(rubyException)) {
             runtime.getThreadService().getMainThread().raise(rubyException);
-        } else if (abortOnException(runtime)) {
-            runtime.getThreadService().getMainThread().raise(rubyException);
-        } else if (reportOnException.isTrue()) {
-            printReportExceptionWarning();
-            runtime.printError(throwable);
+        } else if (abortOnException(runtime) || reportOnException.isTrue()) {
+            if (reportOnException.isTrue()) {
+                printReportExceptionWarning();
+                runtime.printError(throwable);
+            }
+            if (abortOnException(runtime)) {
+                runtime.getThreadService().getMainThread().raise(rubyException);
+            }
         } else if (runtime.isDebug()) {
             runtime.printError(throwable);
         }

diff --git a/spec/tags/ruby/core/string/uminus_tags.txt b/spec/tags/ruby/core/string/uminus_tags.txt
@@ -0,0 +1 @@
+critical(only seems to fail in a full run):String#-@ returns the same object when it's called on the same String literal
diff --git a/test/mri/excludes/TestString.rb b/test/mri/excludes/TestString.rb
@@ -1,3 +1,4 @@
 exclude :test_ASET_limits, "expected behavior; JRuby can only do int range offsets into a string, so error reflects that"
 exclude :test_crypt, "does not raise as expected"
 exclude :test_setter, "does not raise as expected"
+exclude :test_uplus_minus, "only seems to fail in a full test run"
diff --git a/test/mri/excludes/TestThread.rb b/test/mri/excludes/TestThread.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: false
 exclude(/_stack_size$/, 'often too expensive')
 exclude :test_abort_on_exception, "very sensitive to thread timing and parallelism"
+exclude :test_inspect_with_fiber, "Thread.current is known to reflect the fiber, not the thread, in JRuby"
 exclude :test_handle_interrupt, "handle_interrupt is not working properly"
 exclude :test_handle_interrupt_and_p, "handle_interrupt is not working properly"
 exclude :test_handle_interrupt_blocking, "handle_interrupt is not working properly"
@@ -12,6 +13,7 @@
 exclude :test_no_valid_cfp, "may depend on MRI internal stack structures"
 exclude :test_priority, "unreliably depends on thread scheduling"
 exclude :test_recursive_outer, "expected to be fixed by our change based on MRI r43981 but was not"
+exclude :test_report_on_exception, "very sensitive to thread timing and parallelism"
 exclude :test_safe_level, "SAFE levels are unsupported"
 exclude :test_thread_join_in_trap, "fails intermittently (#4956)"
 exclude :test_thread_join_main_thread, "hangs"

diff --git a/test/mri/runner.rb b/test/mri/runner.rb
@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 # frozen_string_literal: false
 require 'rbconfig'
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		critical(only seems to fail in a full run):String#-@ returns the same object when it's called on the same String literal