[Truffle] Upgraded to a newer version of Truffle.

jruby · Sep 18, 2015 · 3cb094f · 3cb094f
1 parent 8638903
commit 3cb094f
Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/truffle/pom.rb b/truffle/pom.rb
@@ -15,7 +15,7 @@
   repository( :url => 'http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/',
               :id => 'truffle' )
 
-  truffle_version = '597953a8e6f01142b9ba4368622d076bb2dc0401-SNAPSHOT'
+  truffle_version = 'e3c6cca3ef533b3ea4cf56e07e51473d0bb8006b-SNAPSHOT'
   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
@@ -31,23 +31,23 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>com.oracle.truffle</groupId>
       <artifactId>truffle-api</artifactId>
-      <version>597953a8e6f01142b9ba4368622d076bb2dc0401-SNAPSHOT</version>
+      <version>e3c6cca3ef533b3ea4cf56e07e51473d0bb8006b-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.oracle.truffle</groupId>
       <artifactId>truffle-debug</artifactId>
-      <version>597953a8e6f01142b9ba4368622d076bb2dc0401-SNAPSHOT</version>
+      <version>e3c6cca3ef533b3ea4cf56e07e51473d0bb8006b-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.oracle.truffle</groupId>
       <artifactId>truffle-dsl-processor</artifactId>
-      <version>597953a8e6f01142b9ba4368622d076bb2dc0401-SNAPSHOT</version>
+      <version>e3c6cca3ef533b3ea4cf56e07e51473d0bb8006b-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.oracle.truffle</groupId>
       <artifactId>truffle-tck</artifactId>
-      <version>597953a8e6f01142b9ba4368622d076bb2dc0401-SNAPSHOT</version>
+      <version>e3c6cca3ef533b3ea4cf56e07e51473d0bb8006b-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/truffle/src/test/java/org/jruby/truffle/tck/RubyTckTest.java b/truffle/src/test/java/org/jruby/truffle/tck/RubyTckTest.java
@@ -53,12 +53,16 @@ protected TruffleVM prepareVM() throws Exception {
                         + "  def object.returnsThis; self; end\n"
                         + "  object\n"
                         +  "end\n"
+                        + "def identity(value)\n"
+                        + "  value\n"
+                        + "end\n"
                         + "Truffle::Interop.export(\"sum_ints\", method(:sum))\n"
                         + "Truffle::Interop.export(\"fourty_two\", method(:fourty_two))\n"
                         + "Truffle::Interop.export(\"ret_nil\", method(:ret_nil))\n"
                         + "Truffle::Interop.export(\"count_invocations\", method(:count_invocations))\n"
                         + "Truffle::Interop.export(\"apply_numbers\", method(:apply_numbers))\n"
-                        + "Truffle::Interop.export(\"compound_object\", method(:compound_object))\n", "test")
+                        + "Truffle::Interop.export(\"compound_object\", method(:compound_object))\n"
+                        + "Truffle::Interop.export(\"identity\", method(:identity))\n", "test")
                 .withMimeType(mimeType());
         final TruffleVM vm = TruffleVM.newVM().build();
         vm.eval(source);
@@ -104,4 +108,9 @@ protected String invalidCode() {
     protected String compoundObject() {
         return "compound_object";
     }
+
+    @Override
+    protected String identity() {
+        return "identity";
+    }
 }