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

Commits on Jan 8, 2018

  1. Grr, dynlangs and refactoring.

    @headius
    headius committed Jan 8, 2018
    Copy the full SHA
    a320da8 View commit details

  2. Isolate threads and ensure they are alive before testing.

    @headius
    headius committed Jan 8, 2018
    Copy the full SHA
    e6a8b40 View commit details
Showing with 9 additions and 6 deletions.
  1. +1 −1 core/src/main/ruby/jruby/jruby.rb
  2. +8 −5 spec/ruby/core/thread/priority_spec.rb
2 changes: 1 addition & 1 deletion core/src/main/ruby/jruby/jruby.rb
View file
Original file line number Diff line number Diff line change
@@ -79,7 +79,7 @@ def compile_ir(content = nil, filename = DEFAULT_FILENAME, extra_position_info =
end

scope = org.jruby.ir.IRBuilder.build_root(manager, node).scope
scope.top_level_scope = node.scope
scope.root_lexical_scope = node.scope

scope
end
13 changes: 8 additions & 5 deletions spec/ruby/core/thread/priority_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,14 @@
require File.expand_path('../fixtures/classes', __FILE__)

describe "Thread#priority" do
before do
before :each do
@current_priority = Thread.current.priority
ThreadSpecs.clear_state
@thread = Thread.new { Thread.pass until ThreadSpecs.state == :exit }
Thread.pass until @thread.alive?
end

after do
after :each do
ThreadSpecs.state = :exit
@thread.join
end
@@ -31,12 +32,14 @@
end

describe "Thread#priority=" do
before do
before :each do
ThreadSpecs.clear_state
@thread = Thread.new {}
@thread = Thread.new { Thread.pass until ThreadSpecs.state == :exit }
Thread.pass until @thread.alive?
end

after do
after :each do
ThreadSpecs.state = :exit
@thread.join
end