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

Commits on Nov 30, 2016

  1. Copy the full SHA
    1475100 View commit details
  2. Revert "[Truffle] Disable RubyDebugTest for now as it's failing const…

    …antly on Travis."
    
    This reverts commit 9c2d923.
    chrisseaton committed Nov 30, 2016
    Copy the full SHA
    b68567a View commit details
Showing with 3 additions and 9 deletions.
  1. +1 −1 mx.jruby/mx_jruby.py
  2. +2 −8 truffle/src/test/ruby/factorial.rb
2 changes: 1 addition & 1 deletion mx.jruby/mx_jruby.py
Original file line number Diff line number Diff line change
@@ -259,7 +259,7 @@ def ruby_command(args):
def ruby_tck(args):
env = setup_jruby_home()
os.environ["JRUBY_HOME"] = env["JRUBY_HOME"]
mx_unittest.unittest(['--verbose', '--suite', 'jruby', 'RubyTckTest'])
mx_unittest.unittest(['--verbose', '--suite', 'jruby'])

mx.update_commands(_suite, {
'ruby' : [ruby_command, '[ruby args|@VM options]'],
10 changes: 2 additions & 8 deletions truffle/src/test/ruby/factorial.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
# 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

def fac(n)
if n <= 1
1
@@ -23,3 +15,5 @@ def main
res
end
Truffle::Interop.export_method(:main)

# Don't add a licence header to this file - we use the line offets!