jruby · Dec 11, 2015 · Dec 11, 2015 · Dec 11, 2015 · Dec 11, 2015 · Dec 11, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -82,9 +82,6 @@ matrix:
     #  dist: trusty
     #  group: edge
     #  jdk: oraclejdk9
-  allow_failures: # TODO: due MRI test imports from 2.2.3 - needs to be reviewed for truffle! 
-    - env: PHASE='-Ptruffle-mri-tests'
-
 
 branches:
   only:

diff --git a/test/mri/excludes_truffle/TestFloat.rb b/test/mri/excludes_truffle/TestFloat.rb
@@ -14,3 +14,4 @@
 exclude :test_strtod, "needs investigation"
 exclude :test_to_s, "needs investigation"
 exclude :test_truncate, "needs investigation"
+exclude :test_hash_0, "-0.0.hash is not == 0.0.hash currently"
diff --git a/test/mri/excludes_truffle/TestMethod.rb b/test/mri/excludes_truffle/TestMethod.rb
@@ -41,3 +41,5 @@
 exclude :test_unlinked_method_entry_in_method_object_bug, "needs investigation"
 exclude :test_visibility, "needs investigation"
 exclude :test_caller_top_level, "needs investigation"
+exclude :test_insecure_method, "needs investigation"
+exclude :test_to_proc_binding, "needs investigation"
diff --git a/test/mri/excludes_truffle/TestRange.rb b/test/mri/excludes_truffle/TestRange.rb
@@ -15,3 +15,4 @@
 exclude :test_range_bsearch_for_floats, "needs investigation"
 exclude :test_range_numeric_string, "needs investigation"
 exclude :test_size, "needs investigation"
+exclude :test_eqq_time, "needs investigation"
diff --git a/test/mri/excludes_truffle/TestSymbol.rb b/test/mri/excludes_truffle/TestSymbol.rb
@@ -4,3 +4,5 @@
 exclude :test_symbol_encoding, "needs investigation"
 exclude :test_symbol_gc_1, "needs investigation"
 exclude :test_to_proc, "needs investigation"
+exclude :test_hash_redefinition, "hangs"
+exclude :test_symbol_fstr_leak, "hangs"
diff --git a/test/mri/excludes_truffle/TestSyntax.rb b/test/mri/excludes_truffle/TestSyntax.rb
@@ -51,3 +51,9 @@
 exclude :test_brace_block_after_blockcall_colon_with_arg, "needs investigation"
 exclude :test_newline_in_block_parameters, "needs investigation"
 exclude :test_warn_unreachable, "needs investigation"
+exclude :test_bad_kwarg, "needs investigation"
+exclude :test_do_block_in_lambda, "needs investigation"
+exclude :test_keyword_self_reference, "needs investigation"
+exclude :test_keyword_empty_splat, "needs investigation"
+exclude :test_null_range_cmdarg, "needs investigation"
+exclude :test_too_big_nth_ref, "needs investigation"
diff --git a/test/mri/excludes_truffle/TestTimeExtension.rb b/test/mri/excludes_truffle/TestTimeExtension.rb
@@ -24,3 +24,12 @@
 exclude :test_xmlschema_fraction, "needs investigation"
 exclude :test_xmlschema_leap_second, "needs investigation"
 exclude :test_zone_0000, "needs investigation"
+exclude :test_iso8601, "needs investigation"
+exclude :test_iso8601_alias, "needs investigation"
+exclude :test_iso8601_encode, "needs investigation"
+exclude :test_iso8601_nsec, "needs investigation"
+exclude :test_strptime_s_N, "needs investigation"
+exclude :test_xmlschema_alias, "needs investigation"
+exclude :test_xmlschema_encode, "needs investigation"
+exclude :test_xmlschema_nsec, "needs investigation"
+exclude :test_iso8601_leap_second, "needs investigation"
diff --git a/tool/jruby_eclipse b/tool/jruby_eclipse
@@ -4,9 +4,12 @@
 
 TRUFFLEJAR = "#{Dir.home}/.m2/repository/com/oracle/truffle/0.7/truffle-0.7.jar"
 SNAKEYAMLJAR = "#{Dir.home}/.m2/repository/org/yaml/snakeyaml/1.14/snakeyaml-1.14.jar"
+ANTLR4JAR = "#{Dir.home}/.m2/repository/org/antlr/antlr4-runtime/4.5/antlr4-runtime-4.5.jar"
 
 JRUBY = File.expand_path('../..', __FILE__)
 
+VERIFY_JRUBY = false
+
 java = ENV["JAVACMD"] || "java"
 
 java_flags = []
@@ -33,10 +36,16 @@ classpath << "#{JRUBY}/lib/jruby-stdlib-9.0.0.0-SNAPSHOT.jar"
 if rest.include?('-X+T')
   bootclasspath << TRUFFLEJAR
   classpath << SNAKEYAMLJAR
+  classpath << ANTLR4JAR
   classpath << "#{JRUBY}/truffle/build.eclipse"
   java_flags << "-Djruby.truffle.core.load_path=#{JRUBY}/truffle/src/main/ruby"
 end
 
+unless VERIFY_JRUBY
+  bootclasspath += classpath
+  classpath.clear
+end
+
 args = [java]
 args << "-Djffi.boot.library.path=#{JRUBY}/lib/jni"
 args << "-Xbootclasspath/a:" + bootclasspath.join(':')

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/layouts/ThreadLayout.java b/truffle/src/main/java/org/jruby/truffle/runtime/layouts/ThreadLayout.java
@@ -31,7 +31,7 @@ DynamicObjectFactory createThreadShape(DynamicObject logicalClass,
 
     DynamicObject createThread(DynamicObjectFactory factory,
                                DynamicObject threadLocals,
-                               InterruptMode interruptMode,
+                               @Volatile InterruptMode interruptMode, // needs to be volatile for fibers implemented by threads
                                @Volatile RubyThread.Status status,
                                List<Lock> ownedLocks,
                                @Nullable FiberManager fiberManager,

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/subsystems/SafepointManager.java b/truffle/src/main/java/org/jruby/truffle/runtime/subsystems/SafepointManager.java
@@ -83,10 +83,13 @@ private void poll(Node currentNode, boolean fromBlockingCall) {
     @TruffleBoundary
     private void assumptionInvalidated(Node currentNode, boolean fromBlockingCall) {
         final DynamicObject thread = context.getThreadManager().getCurrentThread();
-        final boolean interruptible = (Layouts.THREAD.getInterruptMode(thread) == InterruptMode.IMMEDIATE) ||
-                (fromBlockingCall && Layouts.THREAD.getInterruptMode(thread) == InterruptMode.ON_BLOCKING);
+        final InterruptMode interruptMode = Layouts.THREAD.getInterruptMode(thread);
+
+        final boolean interruptible = (interruptMode == InterruptMode.IMMEDIATE) ||
+                (fromBlockingCall && interruptMode == InterruptMode.ON_BLOCKING);
 
         if (!interruptible) {
+            Thread.currentThread().interrupt(); // keep the interrupt flag
             return; // interrupt me later
         }