Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit ae66d27

Browse files
committedSep 29, 2015
Merge pull request #419 from ruby-concurrency/circular
Fixed circular reference.
2 parents d15c5d6 + 0195415 commit ae66d27

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed
 

‎build-tests/runner.rb

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@ def run_test_suite(files, ext, platform = '')
102102
puts SUITE_BREAK
103103

104104
run_test_suite(TEST_FILES, false)
105-
#if mri?
106-
#if ! windows?
107-
#puts SUITE_BREAK
108-
#run_test_suite(TEST_FILES, true)
109-
#end
110-
#if platform_specific_extensions?(RUBY_PLATFORM)
111-
#puts SUITE_BREAK
112-
#run_test_suite(TEST_FILES, true, RUBY_PLATFORM)
113-
#end
114-
#end
105+
if mri?
106+
if ! windows?
107+
puts SUITE_BREAK
108+
run_test_suite(TEST_FILES, true)
109+
end
110+
if platform_specific_extensions?(RUBY_PLATFORM)
111+
puts SUITE_BREAK
112+
run_test_suite(TEST_FILES, true, RUBY_PLATFORM)
113+
end
114+
end

‎lib/concurrent/synchronization.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
require 'concurrent/utility/engine'
22

33
require 'concurrent/synchronization/abstract_object'
4+
require 'concurrent/utility/native_extension_loader' # load native parts first
5+
46
require 'concurrent/synchronization/mri_object'
57
require 'concurrent/synchronization/jruby_object'
68
require 'concurrent/synchronization/rbx_object'
@@ -11,7 +13,6 @@
1113
require 'concurrent/synchronization/jruby_lockable_object'
1214
require 'concurrent/synchronization/rbx_lockable_object'
1315

14-
require 'concurrent/utility/native_extension_loader' # load native part first
1516
require 'concurrent/synchronization/lockable_object'
1617

1718
require 'concurrent/synchronization/condition'

‎lib/concurrent/utility/native_extension_loader.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'concurrent/synchronization' # has to be loaded before JRuby extensions
1+
require 'concurrent/synchronization/abstract_object' # must be loaded before JRuby extensions
22
require 'concurrent/utility/engine'
33

44
module Concurrent

0 commit comments

Comments
 (0)
Please sign in to comment.