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

Commits on May 15, 2015

  1. [Truffle] Add a backtrace_filter for MSpec. 

    * It's just nicely filtering the result of Exception#backtrace, nothing too bad.
    @eregon
    eregon committed May 15, 2015
    Copy the full SHA
    9de1ec5 View commit details

  2. [Truffle] Fix return type of asRubyStringArray.

    @eregon
    eregon committed May 15, 2015
    Copy the full SHA
    7751d72 View commit details
Showing with 3 additions and 1 deletion.
  1. +2 −0 spec/truffle/truffle.mspec
  2. +1 −1 truffle/src/main/java/org/jruby/truffle/runtime/core/RubyException.java
2 changes: 2 additions & 0 deletions spec/truffle/truffle.mspec
View file
Original file line number Diff line number Diff line change
@@ -151,6 +151,8 @@ class MSpecScript
"spec/truffle/specs"
]

set :backtrace_filter, /mspec\//

set :tags_patterns, [
[%r(^.*/language/), 'spec/truffle/tags/language/'],
[%r(^.*/core/), 'spec/truffle/tags/core/'],
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/runtime/core/RubyException.java
View file
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@ public void setBacktrace(Backtrace backtrace) {
this.backtrace = backtrace;
}

public Object asRubyStringArray() {
public RubyArray asRubyStringArray() {
assert backtrace != null;
final String[] lines = Backtrace.EXCEPTION_FORMATTER.format(getContext(), this, backtrace);