From 1d5ea1857fc0be912b89c4c5032733163da5b31b Mon Sep 17 00:00:00 2001 From: Michael Koziarski Date: Sat, 16 Feb 2008 03:08:05 +0000 Subject: Sort files to test to make load order platform independent. Fix the clash this exposes. Closees #11081 [tpope] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8880 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/Rakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actionpack/Rakefile') diff --git a/actionpack/Rakefile b/actionpack/Rakefile index 2bf28ff927..eab3d153cd 100644 --- a/actionpack/Rakefile +++ b/actionpack/Rakefile @@ -26,9 +26,9 @@ task :test => [:test_action_pack, :test_active_record_integration] Rake::TestTask.new(:test_action_pack) { |t| t.libs << "test" -# make sure we include the controller tests (c*) first as on some systems +# 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=Dir.glob( "test/c*/**/*_test.rb" ) + Dir.glob( "test/[ft]*/*_test.rb" ) + t.test_files=Dir.glob( "test/[cft]*/**/*_test.rb" ).sort # t.pattern = 'test/*/*_test.rb' t.verbose = true } -- cgit v1.2.3