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

Commits on May 20, 2015

  1. Copy the full SHA
    81fef8a View commit details
  2. Copy the full SHA
    e2d8538 View commit details
6 changes: 4 additions & 2 deletions rakelib/test.rake
Original file line number Diff line number Diff line change
@@ -20,7 +20,8 @@ namespace :test do
desc "Compile test code"
task :compile do
mkdir_p "test/target/test-classes"
sh "javac -cp lib/jruby.jar:test/target/junit.jar -d test/target/test-classes #{Dir['spec/java_integration/fixtures/**/*.java'].to_a.join(' ')}"
classpath = %w[lib/jruby.jar test/target/junit.jar].join(File::PATH_SEPARATOR)
sh "javac -cp #{classpath} -d test/target/test-classes #{Dir['spec/java_integration/fixtures/**/*.java'].to_a.join(' ')}"
end

short_tests = ['jruby', 'mri']
@@ -107,7 +108,8 @@ namespace :test do
t.verbose = true
t.ruby_opts << '-I.'
t.ruby_opts << '-J-ea'
t.ruby_opts << '-J-cp test:test/target/test-classes:core/target/test-classes'
classpath = %w[test test/target/test-classes core/target/test-classes].join(File::PATH_SEPARATOR)
t.ruby_opts << "-J-cp #{classpath}"
end

permute_tests(:slow, compile_flags) do |t|
4 changes: 4 additions & 0 deletions spec/tags/ruby/core/process/kill_tags.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
windows(JRUBY-4317):Process.kill raises an ArgumentError for unknown signals
windows(hangs):Process.kill signals the process group if the PID is zero
windows(hangs):Process.kill signals the process group if the signal number is negative
windows(hangs):Process.kill signals the process group if the short signal name starts with a minus sign
windows(hangs):Process.kill signals the process group if the full signal name starts with a minus sign
unstable(travis,intermittent):Process.kill accepts a signal name without the 'SIG' prefix
1 change: 1 addition & 0 deletions spec/tags/ruby/library/scanf/io/block_scanf_tags.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
windows(hangs):IO#block_scanf passes each match to the block as an array
1 change: 1 addition & 0 deletions spec/tags/ruby/library/scanf/io/scanf_tags.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
windows(hangs):IO#scanf with block passes each match to the block as an array