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

Commits on Mar 3, 2016

  1. Incorrect test assumption that tempfile opens file as :w which does crlf

    @enebo
    enebo committed Mar 3, 2016
    Copy the full SHA
    fdefbcf View commit details

  2. Windows will explicitly set JVM file.encoding to UTF-8 so MRI tests e… 

    …xecute more consistently
    @enebo
    enebo committed Mar 3, 2016
    Copy the full SHA
    165a83a View commit details

  3. Exclude test which hangs MRI test run on Windows

    @enebo
    enebo committed Mar 3, 2016
    Copy the full SHA
    7254caf View commit details
Showing with 4 additions and 1 deletion.
  1. +2 −1 rakelib/test.rake
  2. +1 −0 test/externals/ruby1.9/excludes/OpenSSL/TestPair.rb
  3. +1 −0 test/externals/ruby1.9/logger/test_logger.rb
3 changes: 2 additions & 1 deletion rakelib/test.rake
View file
Original file line number Diff line number Diff line change
@@ -109,7 +109,8 @@ namespace :test do
t.verbose = true
t.test_files = files_in_file 'test/mri.1.9.index'
ENV['EXCLUDE_DIR'] = 'test/externals/ruby1.9/excludes'
t.ruby_opts << '-J-ea' << '--1.9'
t.ruby_opts << '-J-Dfile.encoding=UTF-8' if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
t.ruby_opts << '-J-ea' << '--1.9'
t.ruby_opts << '-I test/externals/ruby1.9'
t.ruby_opts << '-I test/externals/ruby1.9/ruby'
t.ruby_opts << '-r ./test/ruby19_env.rb'
1 change: 1 addition & 0 deletions test/externals/ruby1.9/excludes/OpenSSL/TestPair.rb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
exclude :test_write_nonblock, 'windows-only?'
1 change: 1 addition & 0 deletions test/externals/ruby1.9/logger/test_logger.rb
View file
Original file line number Diff line number Diff line change
@@ -45,6 +45,7 @@ def log_raw(logger, msg_id, *arg, &block)
logger.__send__(msg_id, *arg, &block)
logdev.open
msg = logdev.read
msg.gsub!(/\r\n/, "\n") # tempfile writes with crlf logic on...fix for tests msg
logdev.close
msg
end