jruby · Mar 7, 2016 · Mar 7, 2016
Showing with 31 additions and 1 deletion.

+5 −0 test/truffle/integration/backtraces/alias.backtrace

+21 −0 test/truffle/integration/backtraces/alias.rb

+5 −1 tool/jt.rb
diff --git a/test/truffle/integration/backtraces/alias.backtrace b/test/truffle/integration/backtraces/alias.backtrace
@@ -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>'
diff --git a/test/truffle/integration/backtraces/alias.rb b/test/truffle/integration/backtraces/alias.rb
@@ -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
diff --git a/tool/jt.rb b/tool/jt.rb
@@ -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