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

Commits on Apr 21, 2015

  1. Squashed 'spec/ruby/' changes from 45d075c..77c82b3 

    77c82b3 Do not rely on thread status for Queue#num_waiting.

git-subtree-dir: spec/ruby
git-subtree-split: 77c82b3e1535364f0ba5187461fd117c62dba93e
    @eregon
    eregon committed Apr 21, 2015
    Copy the full SHA
    4f26468 View commit details

  2. Merge commit '4f26468852acb72f59bde5c5f373b03ce7b039d4'

    @eregon
    eregon committed Apr 21, 2015
    Copy the full SHA
    8e02ad4 View commit details

  3. [Truffle] Fixed the Queue#num_waiting spec.

    @eregon
    eregon committed Apr 21, 2015
    Copy the full SHA
    9bdc321 View commit details
Showing with 1 addition and 4 deletions.
  1. +1 −1 spec/ruby/library/thread/shared/queue/num_waiting.rb
  2. +0 −3 spec/truffle/truffle.mspec
2 changes: 1 addition & 1 deletion spec/ruby/library/thread/shared/queue/num_waiting.rb
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
5.times do |i|
q.num_waiting.should == i
t = Thread.new { q.deq }
Thread.pass until t.status == 'sleep'
Thread.pass until q.num_waiting == i+1
threads << t
end

3 changes: 0 additions & 3 deletions spec/truffle/truffle.mspec
View file
Original file line number Diff line number Diff line change
@@ -110,9 +110,6 @@ class MSpecScript

# LoadError for `load "prime.rb"`
"^spec/ruby/library/prime/each_spec.rb",

# Spec sporadically fails and cannot be tagged.
"^spec/ruby/library/thread/queue/num_waiting_spec.rb"
]

set :tags_patterns, [