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

Commits on Mar 7, 2016

  1. Copy the full SHA
    94e2bae View commit details
  2. Copy the full SHA
    3305227 View commit details
Showing with 31 additions and 1 deletion.
  1. +5 −0 test/truffle/integration/backtraces/alias.backtrace
  2. +21 −0 test/truffle/integration/backtraces/alias.rb
  3. +5 −1 tool/jt.rb
5 changes: 5 additions & 0 deletions test/truffle/integration/backtraces/alias.backtrace
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/alias.rb:19:in `block (2 levels) in <main>'
/alias.rb:12:in `definition_name'
/alias.rb:18:in `block in <main>'
/backtraces.rb:17:in `check'
/alias.rb:17:in `<main>'
21 changes: 21 additions & 0 deletions test/truffle/integration/backtraces/alias.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. This
# code is released under a tri EPL/GPL/LGPL license. You can use it,
# redistribute it and/or modify it under the terms of the:
#
# Eclipse Public License version 1.0
# GNU General Public License version 2
# GNU Lesser General Public License version 2.1

require_relative 'backtraces'

def definition_name
yield
end

alias aliased_name definition_name

check('alias.backtrace') do
aliased_name do
raise 'message'
end
end
6 changes: 5 additions & 1 deletion tool/jt.rb
Original file line number Diff line number Diff line change
@@ -90,7 +90,11 @@ def self.find_jruby
end

def self.find_jruby_bin_dir
File.dirname(find_jruby)
if jruby_eclipse?
JRUBY_DIR + "/bin"
else
File.dirname(find_jruby)
end
end

def self.git_branch