Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c676bdd2ae3c
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f25b903ed85d
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on May 12, 2016

  1. Copy the full SHA
    20917b5 View commit details
  2. [Truffle] Update TCK.

    chrisseaton committed May 12, 2016
    Copy the full SHA
    f25b903 View commit details
Showing with 13 additions and 2 deletions.
  1. +1 −1 truffle/pom.rb
  2. +1 −1 truffle/pom.xml
  3. +5 −0 truffle/src/test/java/org/jruby/truffle/tck/RubyTckTest.java
  4. +6 −0 truffle/src/test/ruby/tck.rb
2 changes: 1 addition & 1 deletion truffle/pom.rb
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@

properties( 'polyglot.dump.pom' => 'pom.xml',
'polyglot.dump.readonly' => true,
'truffle.version' => '4c29f37f94a46b302f0007432285f607a9a3fe2a-SNAPSHOT',
'truffle.version' => '39cbe78a794c79a64a52ef7bf8ef46cc65d18cd7-SNAPSHOT',
'jruby.basedir' => '${basedir}/..' )

jar 'org.yaml:snakeyaml:1.14'
2 changes: 1 addition & 1 deletion truffle/pom.xml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ DO NOT MODIFIY - GENERATED CODE
<jruby.basedir>${basedir}/..</jruby.basedir>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
<truffle.version>4c29f37f94a46b302f0007432285f607a9a3fe2a-SNAPSHOT</truffle.version>
<truffle.version>39cbe78a794c79a64a52ef7bf8ef46cc65d18cd7-SNAPSHOT</truffle.version>
</properties>
<dependencies>
<dependency>
5 changes: 5 additions & 0 deletions truffle/src/test/java/org/jruby/truffle/tck/RubyTckTest.java
Original file line number Diff line number Diff line change
@@ -123,6 +123,11 @@ protected String valuesObject() {
return "values_object";
}

@Override
protected String addToArray() {
return "add_array";
}

@Override
public void testCoExistanceOfMultipleLanguageInstances() throws Exception {
/*
6 changes: 6 additions & 0 deletions truffle/src/test/ruby/tck.rb
Original file line number Diff line number Diff line change
@@ -149,3 +149,9 @@ def values_object
end

Truffle::Interop.export_method(:values_object)

def add_array(array, index, value)
array[index] += value
end

Truffle::Interop.export_method(:add_array)