Fixed circular reference with native extensions.

thomas07vt · Sep 24, 2015 · 0195415 · 0195415
1 parent c65962c
commit 0195415
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/build-tests/runner.rb b/build-tests/runner.rb
@@ -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
diff --git a/lib/concurrent/synchronization.rb b/lib/concurrent/synchronization.rb
@@ -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'

diff --git a/lib/concurrent/utility/native_extension_loader.rb b/lib/concurrent/utility/native_extension_loader.rb
@@ -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