Merge branch 'master' of git://github.com/rails/rails

1 files changed, 9 insertions, 9 deletions

diff --git a/ci/ci_build.rb b/ci/ci_build.rb
index 2a7bbc376e..1602c5106d 100755
--- a/ci/ci_build.rb
+++ b/ci/ci_build.rb
@@ -27,7 +27,7 @@ cd root_dir do
   puts
   puts "[CruiseControl] Bundling RubyGems"
   puts
-  build_results[:bundle] = system 'rm -rf ~/.bundle; env CI=1 bundle install'
+  build_results[:bundle] = system 'sudo rm -rf ~/.bundle; env CI=1 bundle install'
 end
 
 cd "#{root_dir}/activesupport" do
@@ -35,7 +35,7 @@ cd "#{root_dir}/activesupport" do
   puts "[CruiseControl] Building ActiveSupport"
   puts
   build_results[:activesupport] = rake 'test'
-  build_results[:activesupport_isolated] = rake 'test:isolated'
+  # build_results[:activesupport_isolated] = rake 'test:isolated'
 end
 
 cd "#{root_dir}/railties" do
@@ -50,7 +50,7 @@ cd "#{root_dir}/actionpack" do
   puts "[CruiseControl] Building ActionPack"
   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
@@ -58,7 +58,7 @@ cd "#{root_dir}/actionmailer" do
   puts "[CruiseControl] Building ActionMailer"
   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
@@ -66,7 +66,7 @@ cd "#{root_dir}/activemodel" do
   puts "[CruiseControl] Building ActiveModel"
   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"
@@ -75,7 +75,7 @@ cd "#{root_dir}/activeresource" do
   puts "[CruiseControl] Building ActiveResource"
   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"
@@ -84,7 +84,7 @@ cd "#{root_dir}/activerecord" do
   puts "[CruiseControl] Building ActiveRecord with MySQL"
   puts
   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
@@ -92,7 +92,7 @@ cd "#{root_dir}/activerecord" do
   puts "[CruiseControl] Building ActiveRecord with PostgreSQL"
   puts
   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
@@ -100,7 +100,7 @@ cd "#{root_dir}/activerecord" do
   puts "[CruiseControl] Building ActiveRecord with SQLite 3"
   puts
   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