Skip to content

Commit 77422e0

Browse files
committed
Fixed broken CAtomic specs.
1 parent 4082e4f commit 77422e0

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ matrix:
2525
- rvm: jruby-head
2626
- rvm: 1.9.3
2727

28-
script: "bundle exec rake compile && bundle exec rspec --color --backtrace --tag ~unfinished --seed 1 --format documentation ./spec"
28+
script: "rake compile && bundle exec rspec --color --backtrace --tag ~unfinished --seed 1 --format documentation ./spec"

lib/concurrent/atomic.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class Concurrent::Atomic < Concurrent::JavaAtomic
7878
class Concurrent::Atomic < Concurrent::RbxAtomic
7979
end
8080

81-
elsif defined?(CAtomic)
81+
elsif defined?(Concurrent::CAtomic)
8282

8383
# @!macro atomic_reference
8484
class Concurrent::Atomic < Concurrent::CAtomic

spec/concurrent/atomic_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,19 +154,19 @@ module Concurrent
154154
describe Atomic do
155155
if TestHelpers.jruby?
156156
it 'inherits from JavaAtomic' do
157-
expect(Atomic.ancestors).to include(JavaAtomic)
157+
expect(Atomic.ancestors).to include(Concurrent::JavaAtomic)
158158
end
159159
elsif TestHelpers.use_c_extensions?
160160
it 'inherits from CAtomic' do
161-
expect(Atomic.ancestors).to include(CAtomic)
161+
expect(Atomic.ancestors).to include(Concurrent::CAtomic)
162162
end
163163
elsif TestHelpers.rbx?
164164
it 'inherits from RbxAtomic' do
165-
expect(Atomic.ancestors).to include(RbxAtomic)
165+
expect(Atomic.ancestors).to include(Concurrent::RbxAtomic)
166166
end
167167
else
168168
it 'inherits from MutexAtomic' do
169-
expect(Atomic.ancestors).to include(MutexAtomic)
169+
expect(Atomic.ancestors).to include(Concurrent::MutexAtomic)
170170
end
171171
end
172172
end

0 commit comments

Comments
 (0)