jruby · Jan 15, 2016 · Jan 15, 2016 · Jan 16, 2016 · Jan 16, 2016 · Jan 16, 2016
diff --git a/.travis.yml b/.travis.yml
@@ -22,26 +22,8 @@ os:
 
 env:
   global:
-    - JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
     - MALLOC_ARENA_MAX=2
   matrix:
-    - PHASE='-Ptest'
-    - PHASE='-Prake -Dtask=test:jruby'
-    - PHASE='-Prake -Dtask=test:jruby:fullint'
-    - PHASE='-Prake -Dtask=test:jruby:jit'
-    - PHASE='-Prake -Dtask=test:mri'
-    - PHASE='-Prake -Dtask=test:mri:fullint'
-    - PHASE='-Prake -Dtask=test:mri:jit'
-    - PHASE='-Prake -Dtask=test:slow_suites'
-    - PHASE='-Prake -Dtask=test:tracing'
-    - PHASE='-Prake -Dtask=spec:ji'
-    - PHASE='-Prake -Dtask=spec:compiler'
-    - PHASE='-Prake -Dtask=spec:ffi'
-    - PHASE='-Prake -Dtask=spec:regression'
-    - PHASE='-Prake -Dtask=spec:ruby:fast'
-    - PHASE='-Prake -Dtask=spec:jruby'
-    - PHASE='-Prake -Dtask=spec:jrubyc'
-    - PHASE='-Prake -Dtask=spec:profiler'
     - JT='test specs :language'
     - JT='test specs :core'
     - JT='test specs :library'
@@ -51,38 +33,10 @@ env:
 
 matrix:
   include:
-    # these profile do no need to run for all JDKs
-    - env: PHASE='-Pdist'
-      jdk: oraclejdk8
-    - env: PHASE='-Pjruby-jars'
-      jdk: openjdk7
-    - env: PHASE='-Pmain'
-      jdk: oraclejdk8
-    - env: PHASE='-Pcomplete'
-      jdk: oraclejdk8
-    - env: PHASE='-Posgi'
-      jdk: openjdk7
-    - env: PHASE='-Pj2ee'
-      jdk: oraclejdk7
-    # These next two started crashing on JDK7 in March 2015, possibly due to JVM issues on Travis's Docker-based env
-    - env: PHASE='-Pjruby-jars,test -Dinvoker.test=extended'
-      jdk: oraclejdk8
-    - env: PHASE='-Pmain,test -Dinvoker.test=extended'
-      jdk: oraclejdk8
-    - env: PHASE='-Pjruby_complete_jar_extended -Dinvoker.skip=true'
-      jdk: oraclejdk8
     - env: COMMAND=test/check_versions.sh
       jdk: oraclejdk8
     - env: JT=check_ambiguous_arguments
       jdk: oraclejdk8
-  allow_failures:
-    - env: PHASE='-Prake -Dtask=test:mri:fullint'
-    # NOTE: build seems to never start (waited for any to finish for more than a day) - probably a travis-ci bug
-    #- env: PHASE='-Pmain'
-    #  sudo: required
-    #  dist: trusty
-    #  group: edge
-    #  jdk: oraclejdk9
 
 branches:
   only:

diff --git a/bin/jruby.bash b/bin/jruby.bash
@@ -234,16 +234,16 @@ do
               -*)
                 opt="${opt:1}=false" ;;
             esac
-            java_args=("${java_args[@]}" "-Djvmci.option.$opt")
+            java_args=("${java_args[@]}" "-Dgraal.$opt")
         elif [ "${val:0:15}" = "-Djvmci.option." ]; then # Graal options
             opt=${val:15}
-            java_args=("${java_args[@]}" "-Djvmci.option.$opt")
+            java_args=("${java_args[@]}" "-Dgraal.$opt")
         elif [ "${val:0:15}" = "-Dgraal.option." ]; then # Graal options
             opt=${val:15}
-            java_args=("${java_args[@]}" "-Djvmci.option.$opt")
+            java_args=("${java_args[@]}" "-Dgraal.$opt")
         elif [ "${val:0:8}" = "-Dgraal." ]; then # Graal options
             opt=${val:8}
-            java_args=("${java_args[@]}" "-Djvmci.option.$opt")
+            java_args=("${java_args[@]}" "-Dgraal.$opt")
         else
             if [ "${val:0:3}" = "-ea" ]; then
                 VERIFY_JRUBY="yes"

diff --git a/lib/ruby/truffle/truffle/truffle/execjs.rb b/lib/ruby/truffle/truffle/truffle/execjs.rb
@@ -65,9 +65,7 @@ def name
     end
 
     def available?
-      defined?(Truffle::Interop) && Truffle::Interop.eval(JS_MIME_TYPE, 'true')
-    rescue RubyTruffleError
-      false
+      Truffle::Interop.mime_type_supported?('application/javascript')
     end
 
   end

diff --git a/spec/truffle/specs/truffle/interop/mime_type_supported_spec.rb b/spec/truffle/specs/truffle/interop/mime_type_supported_spec.rb
@@ -0,0 +1,21 @@
+# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. This
+# code is released under a tri EPL/GPL/LGPL license. You can use it,
+# redistribute it and/or modify it under the terms of the:
+# 
+# Eclipse Public License version 1.0
+# GNU General Public License version 2
+# GNU Lesser General Public License version 2.1
+
+require_relative '../../../../ruby/spec_helper'
+
+describe "Truffle::Interop.mime_type_supported?" do
+
+  it "returns true for application/x-ruby" do
+    Truffle::Interop.mime_type_supported?('application/x-ruby').should be_true
+  end
+
+  it "returns false for application/x-this-language-does-not-exist" do
+    Truffle::Interop.mime_type_supported?('application/x-this-language-does-not-exist').should be_false
+  end
+
+end
diff --git a/truffle/.factorypath b/truffle/.factorypath
diff --git a/truffle/pom.rb b/truffle/pom.rb
@@ -15,7 +15,7 @@
 
   jar 'org.jruby:jruby-core', '${project.version}', :scope => 'provided'
 
-  truffle_version = '0.10'
+  truffle_version = '0.11'
   jar 'com.oracle.truffle:truffle-api:' + truffle_version
   jar 'com.oracle.truffle:truffle-debug:' + truffle_version
   jar 'com.oracle.truffle:truffle-dsl-processor:' + truffle_version, :scope => 'provided'

diff --git a/truffle/pom.xml b/truffle/pom.xml
@@ -41,23 +41,23 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>com.oracle.truffle</groupId>
       <artifactId>truffle-api</artifactId>
-      <version>0.10</version>
+      <version>0.11</version>
     </dependency>
     <dependency>
       <groupId>com.oracle.truffle</groupId>
       <artifactId>truffle-debug</artifactId>
-      <version>0.10</version>
+      <version>0.11</version>
     </dependency>
     <dependency>
       <groupId>com.oracle.truffle</groupId>
       <artifactId>truffle-dsl-processor</artifactId>
-      <version>0.10</version>
+      <version>0.11</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.oracle.truffle</groupId>
       <artifactId>truffle-tck</artifactId>
-      <version>0.10</version>
+      <version>0.11</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/truffle/src/main/java/org/jruby/truffle/core/TruffleInteropNodes.java b/truffle/src/main/java/org/jruby/truffle/core/TruffleInteropNodes.java
@@ -427,6 +427,21 @@ public Object importObject(DynamicObject name) {
 
     }
 
+    @CoreMethod(names = "mime_type_supported?", isModuleFunction = true, needsSelf = false, required =1)
+    public abstract static class MimeTypeSupportedNode extends CoreMethodArrayArgumentsNode {
+
+        public MimeTypeSupportedNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+        }
+
+        @TruffleBoundary
+        @Specialization(guards = "isRubyString(mimeType)")
+        public boolean isMimeTypeSupported(DynamicObject mimeType) {
+            return getContext().getEnv().isMimeTypeSupported(mimeType.toString());
+        }
+
+    }
+
     @CoreMethod(names = "eval", isModuleFunction = true, needsSelf = false, required = 2)
     @ImportStatic(StringCachingGuards.class)
     public abstract static class EvalNode extends CoreMethodArrayArgumentsNode {

diff --git a/truffle/src/test/java/org/jruby/truffle/tck/RubyTckTest.java b/truffle/src/test/java/org/jruby/truffle/tck/RubyTckTest.java
@@ -106,6 +106,11 @@ protected String complexAdd() {
         return "complex_add";
     }
 
+    @Override
+    protected String complexAddWithMethod() {
+        return "complex_add_with_method";
+    }
+
     @Override
     protected String complexSumReal() {
         return "complex_sum_real";
@@ -116,6 +121,11 @@ protected String complexCopy() {
         return "complex_copy";
     }
 
+    @Override
+    protected String valuesObject() {
+        return "values_object";
+    }
+
     @Override
     public void testCoExistanceOfMultipleLanguageInstances() throws Exception {
         /*

diff --git a/truffle/src/test/ruby/tck.rb b/truffle/src/test/ruby/tck.rb
@@ -85,6 +85,13 @@ def complex_add(a, b)
 
 Truffle::Interop.export_method(:complex_add)
 
+def complex_add_with_method(a, b)
+  Truffle::Interop.write_property a, :imaginary, Truffle::Interop.read_property(a, :imaginary) + Truffle::Interop.read_property(b, :imaginary)
+  Truffle::Interop.write_property a, :real, Truffle::Interop.read_property(a, :real) + Truffle::Interop.read_property(b, :real)
+end
+
+Truffle::Interop.export_method(:complex_add_with_method)
+
 def complex_sum_real(complexes)
   complexes = Truffle::Interop.enumerable(complexes)
 
@@ -110,3 +117,35 @@ def complex_copy(a, b)
 end
 
 Truffle::Interop.export_method(:complex_copy)
+
+class ValuesClass
+
+  attr_accessor :byteValue
+  attr_accessor :shortValue
+  attr_accessor :intValue
+  attr_accessor :longValue
+  attr_accessor :floatValue
+  attr_accessor :doubleValue
+  attr_accessor :charValue
+  attr_accessor :stringValue
+  attr_accessor :booleanValue
+
+  def initialize
+    @byteValue = 0
+    @shortValue = 0
+    @intValue = 0
+    @longValue = 0
+    @floatValue = 0.0
+    @doubleValue = 0.0
+    @charValue = '0'
+    @stringValue = ''
+    @booleanValue = false
+  end
+
+end
+
+def values_object
+  ValuesClass.new
+end
+
+Truffle::Interop.export_method(:values_object)