1 files changed, 69 insertions, 20 deletions
diff --git a/ci/ci_build.rb b/ci/ci_build.rb
index f9933cb922..c3af1f0177 100755
--- a/ci/ci_build.rb
+++ b/ci/ci_build.rb
@@ -19,88 +19,137 @@ puts "[CruiseControl] Rails build"
 build_results = {}
 
 # Install required version of bundler.
-bundler_install_cmd = "sudo gem install bundler --pre --no-ri --no-rdoc"
+bundler_install_cmd = "sudo gem install bundler --no-ri --no-rdoc"
 puts "Running command: #{bundler_install_cmd}"
 build_results[:install_bundler] = system bundler_install_cmd
 
 cd root_dir do
   puts
-  puts "[CruiseControl] Bundling RubyGems"
+  puts "[CruiseControl] Bundling gems"
   puts
-  build_results[:bundle] = system 'rm -rf ~/.bundle; env CI=1 bundle update'
+  build_results[:bundle] = system 'bundle update'
 end
 
 cd "#{root_dir}/activesupport" do
   puts
-  puts "[CruiseControl] Building ActiveSupport"
+  puts "[CruiseControl] Building Active Support"
   puts
   build_results[:activesupport] = rake 'test'
-  # build_results[:activesupport_isolated] = rake 'test:isolated'
+  build_results[:activesupport_isolated] = rake 'test:isolated'
 end
 
+system "sudo rm -R #{root_dir}/railties/tmp"
 cd "#{root_dir}/railties" do
   puts
-  puts "[CruiseControl] Building RailTies"
+  puts "[CruiseControl] Building Railties"
   puts
   build_results[:railties] = rake 'test'
 end
 
 cd "#{root_dir}/actionpack" do
   puts
-  puts "[CruiseControl] Building ActionPack"
+  puts "[CruiseControl] Building Action Pack"
   puts
   build_results[:actionpack] = rake 'test'
-  # build_results[:actionpack_isolated] = rake 'test:isolated'
+  build_results[:actionpack_isolated] = rake 'test:isolated'
 end
 
 cd "#{root_dir}/actionmailer" do
   puts
-  puts "[CruiseControl] Building ActionMailer"
+  puts "[CruiseControl] Building Action Mailer"
   puts
   build_results[:actionmailer] = rake 'test'
-  # build_results[:actionmailer_isolated] = rake 'test:isolated'
+  build_results[:actionmailer_isolated] = rake 'test:isolated'
 end
 
 cd "#{root_dir}/activemodel" do
   puts
-  puts "[CruiseControl] Building ActiveModel"
+  puts "[CruiseControl] Building Active Model"
   puts
   build_results[:activemodel] = rake 'test'
-  # build_results[:activemodel_isolated] = rake 'test:isolated'
+  build_results[:activemodel_isolated] = rake 'test:isolated'
 end
 
 rm_f "#{root_dir}/activeresource/debug.log"
 cd "#{root_dir}/activeresource" do
   puts
-  puts "[CruiseControl] Building ActiveResource"
+  puts "[CruiseControl] Building Active Resource"
   puts
   build_results[:activeresource] = rake 'test'
-  # build_results[:activeresource_isolated] = rake 'test:isolated'
+  build_results[:activeresource_isolated] = rake 'test:isolated'
 end
 
 rm_f "#{root_dir}/activerecord/debug.log"
 cd "#{root_dir}/activerecord" do
   puts
-  puts "[CruiseControl] Building ActiveRecord with MySQL"
+  puts "[CruiseControl] Building Active Record with MySQL IM enabled"
   puts
+  ENV['IM'] = 'true'
   build_results[:activerecord_mysql] = rake 'mysql:rebuild_databases', 'mysql:test'
-  # build_results[:activerecord_mysql_isolated] = rake 'mysql:rebuild_databases', 'mysql:isolated_test'
+  build_results[:activerecord_mysql_isolated] = rake 'mysql:rebuild_databases', 'mysql:isolated_test'
 end
 
 cd "#{root_dir}/activerecord" do
   puts
-  puts "[CruiseControl] Building ActiveRecord with PostgreSQL"
+  puts "[CruiseControl] Building Active Record with MySQL IM disabled"
   puts
+  ENV['IM'] = 'false'
+  build_results[:activerecord_mysql] = rake 'mysql:rebuild_databases', 'mysql:test'
+  build_results[:activerecord_mysql_isolated] = rake 'mysql:rebuild_databases', 'mysql:isolated_test'
+end
+
+cd "#{root_dir}/activerecord" do
+  puts
+  puts "[CruiseControl] Building Active Record with MySQL2 IM enabled"
+  puts
+  ENV['IM'] = 'true'
+  build_results[:activerecord_mysql2] = rake 'mysql:rebuild_databases', 'mysql2:test'
+  build_results[:activerecord_mysql2_isolated] = rake 'mysql:rebuild_databases', 'mysql2:isolated_test'
+end
+
+cd "#{root_dir}/activerecord" do
+  puts
+  puts "[CruiseControl] Building Active Record with MySQL2 IM disabled"
+  puts
+  ENV['IM'] = 'false'
+  build_results[:activerecord_mysql2] = rake 'mysql:rebuild_databases', 'mysql2:test'
+  build_results[:activerecord_mysql2_isolated] = rake 'mysql:rebuild_databases', 'mysql2:isolated_test'
+end
+
+cd "#{root_dir}/activerecord" do
+  puts
+  puts "[CruiseControl] Building Active Record with PostgreSQL IM enabled"
+  puts
+  ENV['IM'] = 'true'
+  build_results[:activerecord_postgresql8] = rake 'postgresql:rebuild_databases', 'postgresql:test'
+  build_results[:activerecord_postgresql8_isolated] = rake 'postgresql:rebuild_databases', 'postgresql:isolated_test'
+end
+
+cd "#{root_dir}/activerecord" do
+  puts
+  puts "[CruiseControl] Building Active Record with PostgreSQL IM disabled"
+  puts
+  ENV['IM'] = 'false'
   build_results[:activerecord_postgresql8] = rake 'postgresql:rebuild_databases', 'postgresql:test'
-  # build_results[:activerecord_postgresql8_isolated] = rake 'postgresql:rebuild_databases', 'postgresql:isolated_test'
+  build_results[:activerecord_postgresql8_isolated] = rake 'postgresql:rebuild_databases', 'postgresql:isolated_test'
+end
+
+cd "#{root_dir}/activerecord" do
+  puts
+  puts "[CruiseControl] Building Active Record with SQLite 3 IM enabled"
+  puts
+  ENV['IM'] = 'true'
+  build_results[:activerecord_sqlite3] = rake 'sqlite3:test'
+  build_results[:activerecord_sqlite3_isolated] = rake 'sqlite3:isolated_test'
 end
 
 cd "#{root_dir}/activerecord" do
   puts
-  puts "[CruiseControl] Building ActiveRecord with SQLite 3"
+  puts "[CruiseControl] Building Active Record with SQLite 3 IM disabled"
   puts
+  ENV['IM'] = 'false'
   build_results[:activerecord_sqlite3] = rake 'sqlite3:test'
-  # build_results[:activerecord_sqlite3_isolated] = rake 'sqlite3:isolated_test'
+  build_results[:activerecord_sqlite3_isolated] = rake 'sqlite3:isolated_test'
 end