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

Commits on May 26, 2016

  1. Copy the full SHA
    dad48e7 View commit details
  2. Copy the full SHA
    fd4e614 View commit details
  3. [Truffle] untag passing tests

    pitr-ch committed May 26, 2016
    Copy the full SHA
    97d7ecc View commit details
Showing with 2 additions and 9 deletions.
  1. +2 −8 lib/ruby/truffle/jruby+truffle/gem_configurations/activesupport.yaml
  2. +0 −1 truffle/src/main/ruby/core/file.rb
Original file line number Diff line number Diff line change
@@ -42,14 +42,9 @@
# mock method_source gem
method_source.rb: nil
exclude_tests.rb: |
failures = { KernelTest: [:test_silence_stream,
:test_quietly],
LoadPathsTest: [:test_uniq_load_paths],
LoggerTest: [:test_buffer_multibyte],
MultibyteCharsExtrasTest: [:test_titleize_should_be_unicode_aware,
:test_titleize_should_not_affect_characters_that_do_not_case_fold],
TimeZoneTest: :test_map_srednekolymsk_to_tzinfo }
failures = { LoadPathsTest: [:test_uniq_load_paths] }
require 'truffle/exclude_rspec_examples'
Truffle.exclude_rspec_examples failures
@@ -67,6 +62,5 @@
- bigdecimal
- pathname
- openssl-stubs
- truffle/exclude_rspec_examples
:environment:
N: 1
1 change: 0 additions & 1 deletion truffle/src/main/ruby/core/file.rb
Original file line number Diff line number Diff line change
@@ -1267,7 +1267,6 @@ def atime
end

def reopen(other, mode = 'r+')
rewind unless closed?
unless other.kind_of? IO
other = Rubinius::Type.coerce_to_path(other)
end