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: ec7e25e225a5
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 40844ffaa39d
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 28, 2015

  1. [Truffle] Unexclude timeout-related specs. 

    * It's implemented now.
    @eregon
    eregon committed Sep 28, 2015
    Copy the full SHA
    d4c38d2 View commit details

  2. [Truffle] Remove old spec exclusion.

    @eregon
    eregon committed Sep 28, 2015
    Copy the full SHA
    1f8a35a View commit details

  3. [Truffle] Lower args in StringSubstringPrimitiveNode.

    @eregon
    eregon committed Sep 28, 2015
    Copy the full SHA
    40844ff View commit details
Showing with 1 addition and 16 deletions.
  1. +0 −15 spec/truffle/truffle.mspec
  2. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/StringPrimitiveNodes.java
15 changes: 0 additions & 15 deletions spec/truffle/truffle.mspec
View file
Original file line number Diff line number Diff line change
@@ -32,17 +32,11 @@ class MSpecScript
"^spec/ruby/core/marshal/load_spec.rb",
"^spec/ruby/core/marshal/restore_spec.rb",

# require 'timeout'
"^spec/ruby/core/process/detach_spec.rb",

# fail tag not excluding
"^spec/ruby/core/string/modulo_spec.rb",

# require etc, linux only spec
"^spec/ruby/core/io/advise_spec.rb",

# Pollutes other tests
"^spec/ruby/core/argf/binmode_spec.rb"
]

core += [
@@ -98,15 +92,6 @@ class MSpecScript
# Load issues with 'delegate'.
"^spec/ruby/library/delegate/delegate_class/instance_method_spec.rb",
"^spec/ruby/library/delegate/delegator/protected_methods_spec.rb",

# LoadError for `load "prime.rb"`
"^spec/ruby/library/prime/each_spec.rb",

# Loads 'timeout', which doesn't work yet and results in a message printed to console about Rubinius::Channel#receive
# not being implemented.
"^spec/ruby/library/net",
"^spec/ruby/library/resolv",
"^spec/ruby/library/timeout"
]

set :truffle, [
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/rubinius/StringPrimitiveNodes.java
View file
Original file line number Diff line number Diff line change
@@ -1159,7 +1159,7 @@ public DynamicObject stringByteAppend(DynamicObject string, DynamicObject other)

}

@RubiniusPrimitive(name = "string_substring")
@RubiniusPrimitive(name = "string_substring", lowerFixnumParameters = { 1, 2 })
@ImportStatic(StringGuards.class)
public static abstract class StringSubstringPrimitiveNode extends RubiniusPrimitiveNode {