diff options
| author | Matthew Draper <matthew@trebex.net> | 2014-09-05 23:32:48 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2014-09-05 23:33:27 +0930 |
| commit | 7025d7769dc53f0a3ffab8b537727ef3fee367fc (patch) | |
| tree | e4e8a40012274aa5003357a86848bc9004dd51e2 | |
| parent | 4c440a54e9d4f360ff1f0c208a5977758f71f950 (diff) | |
| download | rails-7025d7769dc53f0a3ffab8b537727ef3fee367fc.tar.gz rails-7025d7769dc53f0a3ffab8b537727ef3fee367fc.tar.bz2 rails-7025d7769dc53f0a3ffab8b537727ef3fee367fc.zip | |
For now, we will keep sorting the tests.
This reverts commits e969c928463e329fd6529ac59cad96385c538ffb and
bd2b3fbe54e750ba97469a7896e8d143d6dfd465.
| -rw-r--r-- | actionpack/Rakefile | 5 | ||||
| -rw-r--r-- | actionview/Rakefile | 2 | ||||
| -rw-r--r-- | activemodel/Rakefile | 2 | ||||
| -rw-r--r-- | activerecord/Rakefile | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/actionpack/Rakefile b/actionpack/Rakefile index cf20751687..af075f82ad 100644 --- a/actionpack/Rakefile +++ b/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 diff --git a/actionview/Rakefile b/actionview/Rakefile index 3a8bcc4dfe..d56fe9ea76 100644 --- a/actionview/Rakefile +++ b/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 diff --git a/activemodel/Rakefile b/activemodel/Rakefile index 1e90305a8c..407dda2ec3 100644 --- a/activemodel/Rakefile +++ b/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 diff --git a/activerecord/Rakefile b/activerecord/Rakefile index 4d5178ff02..b1069e5dcc 100644 --- a/activerecord/Rakefile +++ b/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 |