Permalink
Browse files

Fixed circular reference with native extensions.

1 parent c65962c commit 0195415c7efa5faabc1bec14cbfea2bd938979fa @jdantonio jdantonio committed Sep 24, 2015
Showing with 13 additions and 12 deletions.
  1. +10 −10 build-tests/runner.rb
  2. +2 −1 lib/concurrent/synchronization.rb
  3. +1 −1 lib/concurrent/utility/native_extension_loader.rb
View
@@ -102,13 +102,13 @@ def run_test_suite(files, ext, platform = '')
puts SUITE_BREAK
run_test_suite(TEST_FILES, false)
-#if mri?
- #if ! windows?
- #puts SUITE_BREAK
- #run_test_suite(TEST_FILES, true)
- #end
- #if platform_specific_extensions?(RUBY_PLATFORM)
- #puts SUITE_BREAK
- #run_test_suite(TEST_FILES, true, RUBY_PLATFORM)
- #end
-#end
+if mri?
+ if ! windows?
+ puts SUITE_BREAK
+ run_test_suite(TEST_FILES, true)
+ end
+ if platform_specific_extensions?(RUBY_PLATFORM)
+ puts SUITE_BREAK
+ run_test_suite(TEST_FILES, true, RUBY_PLATFORM)
+ end
+end
@@ -1,6 +1,8 @@
require 'concurrent/utility/engine'
require 'concurrent/synchronization/abstract_object'
+require 'concurrent/utility/native_extension_loader' # load native parts first
+
require 'concurrent/synchronization/mri_object'
require 'concurrent/synchronization/jruby_object'
require 'concurrent/synchronization/rbx_object'
@@ -11,7 +13,6 @@
require 'concurrent/synchronization/jruby_lockable_object'
require 'concurrent/synchronization/rbx_lockable_object'
-require 'concurrent/utility/native_extension_loader' # load native part first
require 'concurrent/synchronization/lockable_object'
require 'concurrent/synchronization/condition'
@@ -1,4 +1,4 @@
-require 'concurrent/synchronization' # has to be loaded before JRuby extensions
+require 'concurrent/synchronization/abstract_object' # must be loaded before JRuby extensions
require 'concurrent/utility/engine'
module Concurrent

0 comments on commit 0195415

Please sign in to comment.