Merge pull request #325 from ruby-concurrency/fix-build-tests

Fix build tests

Author: jdantonio

.gitignore

@@ -35,3 +35,4 @@ ext/**/*.bundle
 ext/**/*.so
 ext/**/*.jar
 pkg
+*.csv

build-tests/atomic_reference_builds_spec.rb

@@ -23,62 +23,62 @@ def atomic_reference_test(clazz, opts = {})
   stats
 end
 
-describe Concurrent::Atomic do
+describe Concurrent::AtomicReference do
 
   let!(:threads) { 10 }
   let!(:tests) { 1000 }
 
-  describe Concurrent::MutexAtomic do
+  describe Concurrent::MutexAtomicReference do
 
     specify 'is defined' do
-      expect(defined?(Concurrent::MutexAtomic)).to be_truthy
+      expect(defined?(Concurrent::MutexAtomicReference)).to be_truthy
     end
 
     specify 'runs the benchmarks' do
-      stats = atomic_reference_test('MutexAtomic', threads: threads, tests: tests)
+      stats = atomic_reference_test('MutexAtomicReference', threads: threads, tests: tests)
       expect(stats).to be_benchmark_results
     end
   end
 
   if jruby? && 'JRUBY' == ENV['TEST_PLATFORM'].strip
 
-    describe Concurrent::JavaAtomic do
+    describe Concurrent::JavaAtomicReference do
 
-      specify 'Concurrent::JavaAtomic is defined' do
-        expect(defined?(Concurrent::JavaAtomic)).to be_truthy
+      specify 'Concurrent::JavaAtomicReference is defined' do
+        expect(defined?(Concurrent::JavaAtomicReference)).to be_truthy
       end
 
       specify 'runs the benchmarks' do
-        stats = atomic_reference_test('JavaAtomic', threads: threads, tests: tests)
+        stats = atomic_reference_test('JavaAtomicReference', threads: threads, tests: tests)
         expect(stats).to be_benchmark_results
       end
     end
 
   else
 
-    specify 'Concurrent::JavaAtomic is not defined' do
-      expect(defined?(Concurrent::JavaAtomic)).to be_falsey
+    specify 'Concurrent::JavaAtomicReference is not defined' do
+      expect(defined?(Concurrent::JavaAtomicReference)).to be_falsey
     end
   end
 
   if 'EXT' == ENV['TEST_PLATFORM'].strip
 
-    describe Concurrent::CAtomic do
+    describe Concurrent::CAtomicReference do
 
-      specify 'Concurrent::CAtomic is defined' do
-        expect(defined?(Concurrent::CAtomic)).to be_truthy
+      specify 'Concurrent::CAtomicReference is defined' do
+        expect(defined?(Concurrent::CAtomicReference)).to be_truthy
       end
 
       specify 'runs the benchmarks' do
-        stats = atomic_reference_test('CAtomic', threads: threads, tests: tests)
+        stats = atomic_reference_test('CAtomicReference', threads: threads, tests: tests)
         expect(stats).to be_benchmark_results
       end
     end
 
   else
 
-    specify 'Concurrent::CAtomic is not defined' do
-      expect(defined?(Concurrent::CAtomic)).to be_falsey
+    specify 'Concurrent::CAtomicReference is not defined' do
+      expect(defined?(Concurrent::CAtomicReference)).to be_falsey
     end
   end
 end

build-tests/runner.rb

@@ -69,13 +69,13 @@ def run_test_suite(files, ext, platform = '')
 
   test_platform = if ext
                     'EXT'
-                  elsif jruby?(platform)
+                  elsif jruby?
                     'JRUBY'
                   else
                     'RUBY'
                   end
 
-  cmd = if jruby?(platform)
+  cmd = if jruby?
           install_java_gem_command
         else
           install_gems_command(ext, platform)
@@ -102,10 +102,7 @@ def run_test_suite(files, ext, platform = '')
 puts SUITE_BREAK
 
 run_test_suite(TEST_FILES, false)
-if jruby?
-  puts SUITE_BREAK
-  run_test_suite(TEST_FILES, false, 'jruby')
-elsif mri?
+if mri?
   if ! windows?
     puts SUITE_BREAK
     run_test_suite(TEST_FILES, true)

examples/actor_stress_test.rb

@@ -84,7 +84,8 @@ def test(threads, loops)
           expect(queue.pop).to eq 3
 
           actor << :terminate!
-          expect(actor.ask(:blow_up).wait).to be_rejected
+          #expect(actor.ask(:blow_up).wait).to be_rejected
+          expect(actor.ask(:blow_up).wait).to be_failed
           terminate_actors(actor, child)
         end
       end

examples/at_exit_tester.rb

@@ -5,7 +5,7 @@
 require 'concurrent'
 
 # with this, a JRuby process will never exit
-Concurrent.disable_auto_termination_of_all_executors!
+Concurrent.disable_executor_auto_termination!
 
 SIZE = 5
 

examples/atomic_example.rb

@@ -2,9 +2,9 @@
 
 $: << File.expand_path('../../lib', __FILE__)
 
-require 'concurrent/atomic'
+require 'concurrent/atomics'
 
-my_atomic = Concurrent::Atomic.new(0)
+my_atomic = Concurrent::AtomicReference.new(0)
 my_atomic.update {|v| v + 1}
 puts "new value: #{my_atomic.value}"
 

examples/bench_atomic.rb

@@ -6,9 +6,9 @@
 require 'rbconfig'
 require 'thread'
 
-require 'concurrent/atomic'
+require 'concurrent/atomics'
 
-if RUBY_PLATFORM != 'java' && ! defined? Concurrent::CAtomic
+if RUBY_PLATFORM != 'java' && ! defined? Concurrent::CAtomicReference
   warn "[WARN] C extensions not loaded!"
 end
 
@@ -24,10 +24,10 @@
 
 # list of platform-specific implementations
 ATOMICS = [
-  'MutexAtomic',
-  'CAtomic',
-  'JavaAtomic',
-  'RbxAtomic',
+  'MutexAtomicReference',
+  'CAtomicReference',
+  'JavaAtomicReference',
+  'RbxAtomicReference',
 ]
 
 puts "Testing with #{RbConfig::CONFIG['ruby_install_name']} #{RUBY_VERSION}"

examples/bench_atomic_1.rb

@@ -6,9 +6,9 @@
 require 'thread'
 require 'benchmark'
 
-require 'concurrent/atomic'
+require 'concurrent/atomics'
 
-unless defined? Concurrent::CAtomic
+unless defined? Concurrent::CAtomicReference
   warn "[ERROR] C extensions not loaded!"
   exit(1)
 end

examples/benchmark_new_futures.rb

@@ -1,3 +1,7 @@
+#!/usr/bin/env ruby
+
+$: << File.expand_path('../../lib', __FILE__)
+
 require 'benchmark/ips'
 require 'concurrent'
 require 'concurrent-edge'