Skip to content

Commit

Permalink
Fixed broken CAtomic specs.
Browse files Browse the repository at this point in the history
  • Loading branch information
jdantonio committed Dec 13, 2014
1 parent 5dc4c5a commit ca3046e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ matrix:
- rvm: jruby-head
- rvm: 1.9.3

script: "bundle exec rake compile && bundle exec rspec --color --backtrace --tag ~unfinished --seed 1 --format documentation ./spec"
script: "rake compile && bundle exec rspec --color --backtrace --tag ~unfinished --seed 1 --format documentation ./spec"
2 changes: 1 addition & 1 deletion lib/concurrent/atomic.rb
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class Concurrent::Atomic < Concurrent::JavaAtomic
class Concurrent::Atomic < Concurrent::RbxAtomic
end

elsif defined?(CAtomic)
elsif defined?(Concurrent::CAtomic)

# @!macro atomic_reference
class Concurrent::Atomic < Concurrent::CAtomic
Expand Down
8 changes: 4 additions & 4 deletions spec/concurrent/atomic_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -154,19 +154,19 @@ module Concurrent
describe Atomic do
if TestHelpers.jruby?
it 'inherits from JavaAtomic' do
expect(Atomic.ancestors).to include(JavaAtomic)
expect(Atomic.ancestors).to include(Concurrent::JavaAtomic)
end
elsif TestHelpers.use_c_extensions?
it 'inherits from CAtomic' do
expect(Atomic.ancestors).to include(CAtomic)
expect(Atomic.ancestors).to include(Concurrent::CAtomic)
end
elsif TestHelpers.rbx?
it 'inherits from RbxAtomic' do
expect(Atomic.ancestors).to include(RbxAtomic)
expect(Atomic.ancestors).to include(Concurrent::RbxAtomic)
end
else
it 'inherits from MutexAtomic' do
expect(Atomic.ancestors).to include(MutexAtomic)
expect(Atomic.ancestors).to include(Concurrent::MutexAtomic)
end
end
end
Expand Down

0 comments on commit ca3046e

Please sign in to comment.