1515require 'concurrent/version'
1616require_relative 'platform_helpers'
1717
18+
1819EXT_PLATFORMS = {
1920 'i686-linux' => 'x86-linux' ,
2021 'x86_64-linux' => 'x86_64-linux' ,
21- 'x86 -mingw32' => 'x86-mingw32' ,
22+ 'i386 -mingw32' => 'x86-mingw32' ,
2223 'x64-mingw32' => 'x64-mingw32' ,
2324 'i386-solaris2.11' => 'x86-solaris-2.11' ,
2425 'x86_64-darwin14.0' => 'x86_64-darwin-14' ,
2829PKG_PATH = File . join ( File . dirname ( __FILE__ ) , '..' , 'pkg' )
2930TEST_FILES = Dir [ "#{ TEST_PATH } /*_spec.rb" ]
3031
31- RSPEC = "rspec --default-path #{ TEST_PATH } -fd --color --seed 0"
32+ RSPEC = "rspec --default-path #{ TEST_PATH } -fd #{ windows? ? '' : ' --color' } --seed 0"
3233
3334INSTALL_RSPEC_COMMAND = 'gem install rspec'
3435
@@ -55,7 +56,7 @@ def extension_gem_name(platform = RUBY_PLATFORM)
5556def install_gems_command ( ext , platform = '' )
5657 cmd = "gem install #{ PKG_PATH } /concurrent-ruby-#{ Concurrent ::VERSION } .gem"
5758 if ext
58- cmd << "\n gem install #{ PKG_PATH } /#{ extension_gem_name ( platform ) } "
59+ cmd << " && gem install #{ PKG_PATH } /#{ extension_gem_name ( platform ) } "
5960 end
6061 cmd
6162end
@@ -83,7 +84,7 @@ def run_test_suite(files, ext, platform = '')
8384
8485 files . each do |file |
8586 if windows?
86- cmd = "set TEST_PLATFORM=' #{ test_platform } ' && #{ RSPEC } #{ file } "
87+ cmd = "set TEST_PLATFORM=#{ test_platform } && #{ RSPEC } #{ file } "
8788 else
8889 cmd = "TEST_PLATFORM='#{ test_platform } ' #{ RSPEC } #{ file } "
8990 end
@@ -105,8 +106,10 @@ def run_test_suite(files, ext, platform = '')
105106 puts SUITE_BREAK
106107 run_test_suite ( TEST_FILES , false , 'jruby' )
107108elsif mri?
108- puts SUITE_BREAK
109- run_test_suite ( TEST_FILES , true )
109+ if ! windows?
110+ puts SUITE_BREAK
111+ run_test_suite ( TEST_FILES , true )
112+ end
110113 if platform_specific_extensions? ( RUBY_PLATFORM )
111114 puts SUITE_BREAK
112115 run_test_suite ( TEST_FILES , true , RUBY_PLATFORM )
0 commit comments