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

Commits on Jul 13, 2015

  1. Improve Thread#wakeup spec

    @eregon
    eregon committed Jul 13, 2015
    Copy the full SHA
    9888ee5 View commit details

  2. [Truffle] Tag flaky spec.

    @eregon
    eregon committed Jul 13, 2015
    Copy the full SHA
    d9a309e View commit details
Showing with 5 additions and 3 deletions.
  1. +4 −3 spec/ruby/core/thread/shared/wakeup.rb
  2. +1 −0 spec/truffle/tags/core/threadgroup/list_tags.txt
7 changes: 4 additions & 3 deletions spec/ruby/core/thread/shared/wakeup.rb
View file
Original file line number Diff line number Diff line change
@@ -36,10 +36,10 @@

it "does not result in a deadlock" do
t = Thread.new do
1000.times {Thread.stop }
100.times { Thread.stop }
end

while(t.status != false) do
while t.status
begin
t.send(@method)
rescue ThreadError
@@ -49,7 +49,8 @@
Thread.pass
end

1.should == 1 # test succeeds if we reach here
t.status.should == false
t.join
end

it "raises a ThreadError when trying to wake up a dead thread" do
1 change: 1 addition & 0 deletions spec/truffle/tags/core/threadgroup/list_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fails(hangs on Travis):ThreadGroup#list returns the list of threads in the group