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: b4f5a169d6c7
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f127aebc3c0a
Choose a head ref

Commits on May 14, 2016

  1. Copy the full SHA
    16f9389 View commit details
  2. Copy the full SHA
    12fa3c9 View commit details

Commits on May 16, 2016

  1. Merge branch 'master' into truffle-head

    # Conflicts:
    #	.travis.yml
    chrisseaton committed May 16, 2016
    Copy the full SHA
    4ceccbd View commit details
  2. [Truffle] Fix bad merge.

    chrisseaton committed May 16, 2016
    Copy the full SHA
    634a6a6 View commit details
  3. Copy the full SHA
    f7d805a View commit details
  4. Copy the full SHA
    edbd334 View commit details
  5. Copy the full SHA
    c6a062e View commit details
  6. Merge branch 'master' into truffle-head

    # Conflicts:
    #	ci.hocon
    chrisseaton committed May 16, 2016
    Copy the full SHA
    8597c4e View commit details

Commits on May 17, 2016

  1. Copy the full SHA
    edba9cc View commit details

Commits on May 18, 2016

  1. Copy the full SHA
    279e0bd View commit details

Commits on May 20, 2016

  1. Merge branch 'master' into truffle-head

    # Conflicts:
    #	.travis.yml
    #	truffle/pom.rb
    chrisseaton committed May 20, 2016
    Copy the full SHA
    e17bcea View commit details
  2. Copy the full SHA
    9e9ee2e View commit details

Commits on May 21, 2016

  1. Copy the full SHA
    2c1e887 View commit details

Commits on May 22, 2016

  1. Copy the full SHA
    a8a22c4 View commit details

Commits on May 24, 2016

  1. Copy the full SHA
    9be859a View commit details
  2. Copy the full SHA
    aec8314 View commit details
  3. Copy the full SHA
    29b9e75 View commit details
  4. Copy the full SHA
    36ef8f1 View commit details

Commits on May 25, 2016

  1. Copy the full SHA
    a62df65 View commit details
  2. Copy the full SHA
    95e9395 View commit details
  3. Copy the full SHA
    42aeb1e View commit details
  4. Copy the full SHA
    8432aab View commit details
  5. Copy the full SHA
    54c031b View commit details

Commits on May 27, 2016

  1. Copy the full SHA
    ff9d5b9 View commit details
  2. Copy the full SHA
    9f1d761 View commit details
  3. Copy the full SHA
    f1c4782 View commit details

Commits on May 28, 2016

  1. Copy the full SHA
    258a83c View commit details
  2. Copy the full SHA
    16a8dac View commit details
  3. Copy the full SHA
    a21d35d View commit details
  4. Copy the full SHA
    27c79e9 View commit details

Commits on May 30, 2016

  1. Copy the full SHA
    fc66125 View commit details

Commits on Jun 5, 2016

  1. Copy the full SHA
    57cd69e View commit details
  2. Copy the full SHA
    fbed273 View commit details

Commits on Jun 7, 2016

  1. Copy the full SHA
    464747a View commit details
  2. Copy the full SHA
    f127aeb View commit details
Showing with 11 additions and 0 deletions.
  1. +5 −0 truffle/src/test/java/org/jruby/truffle/tck/RubyTckTest.java
  2. +6 −0 truffle/src/test/ruby/tck.rb
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)