For now, we will keep sorting the tests.

This reverts commits e969c92846 and
bd2b3fbe54.

actionpack/Rakefile

@@ -9,7 +9,10 @@ task :default => :test
 # Run the unit tests
 Rake::TestTask.new do |t|
   t.libs << 'test'
-  t.test_files = test_files
+
+  # make sure we include the tests in alphabetical order as on some systems
+  # this will not happen automatically and the tests (as a whole) will error
+  t.test_files = test_files.sort
 
   t.warning = true
   t.verbose = true

actionview/Rakefile

@@ -18,7 +18,7 @@ namespace :test do
 
   Rake::TestTask.new(:template) do |t|
     t.libs << 'test'
-    t.test_files = Dir.glob('test/template/**/*_test.rb')
+    t.test_files = Dir.glob('test/template/**/*_test.rb').sort
     t.warning = true
     t.verbose = true
   end

activemodel/Rakefile

@@ -6,7 +6,7 @@ task :default => :test
 
 Rake::TestTask.new do |t|
   t.libs << "test"
-  t.test_files = Dir.glob("#{dir}/test/cases/**/*_test.rb")
+  t.test_files = Dir.glob("#{dir}/test/cases/**/*_test.rb").sort
   t.warning = true
   t.verbose = true
 end

activerecord/Rakefile

@@ -51,7 +51,7 @@ end
       t.libs << 'test'
       t.test_files = (Dir.glob( "test/cases/**/*_test.rb" ).reject {
         |x| x =~ /\/adapters\//
-      } + Dir.glob("test/cases/adapters/#{adapter_short}/**/*_test.rb"))
+      } + Dir.glob("test/cases/adapters/#{adapter_short}/**/*_test.rb")).sort
 
       t.warning = true
       t.verbose = true