jruby · Feb 23, 2016 · Feb 23, 2016 · Feb 23, 2016
Showing with 5 additions and 6 deletions.

+0 −1 core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java

+0 −1 core/src/main/java/org/jruby/util/cli/ArgumentProcessor.java

+4 −4 rakelib/test.rake

+1 −0 test/mri/excludes/TestClass.rb
diff --git a/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java b/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java
@@ -1764,7 +1764,6 @@ public static Block prepareBlock(ThreadContext context, IRubyObject self, Dynami
         return block;
     }
 
-    @JIT
     public static RubyString newFrozenString(ThreadContext context, ByteList bytelist, int coderange, String file, int line) {
         Ruby runtime = context.runtime;
 

diff --git a/core/src/main/java/org/jruby/util/cli/ArgumentProcessor.java b/core/src/main/java/org/jruby/util/cli/ArgumentProcessor.java
@@ -425,7 +425,6 @@ private void processArgument() {
                         disallowedInRubyOpts(argument);
                         Options.DEBUG_FULLTRACE.force("true");
                         RubyInstanceConfig.FULL_TRACE_ENABLED = true;
-                        config.setCompileMode(RubyInstanceConfig.CompileMode.OFF);
                         config.setDebuggingFrozenStringLiteral(true);
                         break FOR;
                     } else if (argument.startsWith("--debug=")) {

diff --git a/rakelib/test.rake b/rakelib/test.rake
@@ -78,22 +78,22 @@ namespace :test do
   namespace :mri do
     mri_test_files = File.readlines('test/mri.index').grep(/^[^#]\w+/).map(&:chomp).join(' ')
     task :int do
-      ENV['JRUBY_OPTS'] = ENV['JRUBY_OPTS'].to_s + ' -Xbacktrace.style=mri -X-C'
+      ENV['JRUBY_OPTS'] = ENV['JRUBY_OPTS'].to_s + ' -Xbacktrace.style=mri --debug -X-C'
       ruby "-r ./test/mri_test_env.rb test/mri/runner.rb #{ADDITIONAL_TEST_OPTIONS} -q -- #{mri_test_files}"
     end
 
     task :fullint do
-      ENV['JRUBY_OPTS'] = ENV['JRUBY_OPTS'].to_s + ' -Xbacktrace.style=mri -X-C -Xjit.threshold=0 -Xjit.background=false'
+      ENV['JRUBY_OPTS'] = ENV['JRUBY_OPTS'].to_s + ' -Xbacktrace.style=mri --debug -X-C -Xjit.threshold=0 -Xjit.background=false'
       ruby "-r ./test/mri_test_env.rb test/mri/runner.rb #{ADDITIONAL_TEST_OPTIONS} -q -- #{mri_test_files}"
     end
 
     task :jit do
-      ENV['JRUBY_OPTS'] = ENV['JRUBY_OPTS'].to_s + ' -Xbacktrace.style=mri -J-XX:MaxPermSize=512M -Xjit.threshold=0 -Xjit.background=false'
+      ENV['JRUBY_OPTS'] = ENV['JRUBY_OPTS'].to_s + ' -Xbacktrace.style=mri --debug -J-XX:MaxPermSize=512M -Xjit.threshold=0 -Xjit.background=false'
       ruby "-r ./test/mri_test_env.rb test/mri/runner.rb #{ADDITIONAL_TEST_OPTIONS} -q -- #{mri_test_files}"
     end
 
     task :aot do
-      ENV['JRUBY_OPTS'] = ENV['JRUBY_OPTS'].to_s + ' -Xbacktrace.style=mri -J-XX:MaxPermSize=512M -X+C -Xjit.background=false'
+      ENV['JRUBY_OPTS'] = ENV['JRUBY_OPTS'].to_s + ' -Xbacktrace.style=mri --debug -J-XX:MaxPermSize=512M -X+C -Xjit.background=false'
       ruby "-r ./test/mri_test_env.rb test/mri/runner.rb #{ADDITIONAL_TEST_OPTIONS} -q -- #{mri_test_files}"
     end
 

diff --git a/test/mri/excludes/TestClass.rb b/test/mri/excludes/TestClass.rb
@@ -7,4 +7,5 @@
 exclude :test_redefine_private_class, "needs investigation"
 exclude :test_redefinition_mismatch, "parser issue with Japanese identifiers (#3679)"
 exclude :test_singleton_class_message, "error says object instead of Class"
+exclude :test_singleton_class_should_has_own_namespace, "new behavior for 2.3 (#3693)"
 exclude :test_uninitialized, "needs investigation"