@@ -7,6 +7,8 @@ task :spec => :test # SPECS =============================================================== +task(:test) { puts "==> Running main test suite" } + Rake::TestTask.new(:test) do |t| t.test_files = FileList['test/*_test.rb'] t.ruby_opts = ['-rubygems'] if defined? Gem @@ -16,18 +18,17 @@ desc "Run < 0.9.x compatibility specs" task :compat do begin require 'mocha' - rescue LoadError - puts 'WARN: skipping compat tests. mocha gem required.' - next - end + require 'test/spec' + at_exit { exit 0 } # disable test-spec at_exit runner - if ! system('specrb --help &>/dev/null') - puts 'WARN: skipping compat tests. test-spec gem required.' - next + puts "==> Running compat test suite" + Rake::TestTask.new(:compat) do |t| + t.test_files = FileList['compat/*_test.rb'] + t.ruby_opts = ['-rubygems'] if defined? Gem + end + rescue LoadError + warn 'Skipping compat tests. mocha and/or test-spec gems not installed.' end - - pattern = ENV['TEST'] || '.*' - sh "specrb --testcase '#{pattern}' -Ilib:test compat/*_test.rb" end # PACKAGING ============================================================ Rakefile c31a2b8544dc1c517878e2bb31d9b3d2d27d2327 Simon Rozet simon@rozet.name http://github.com/sr/sinatra/commit/caca9abd4ccbb4ee0cdfe1ff0963201bc3819d93 caca9abd4ccbb4ee0cdfe1ff0963201bc3819d93 2009-04-26T04:42:47-07:00 2009-04-20T08:12:54-07:00 Try to run compat tests with Rake::TestTask This should make the compat specs run under integrity installs at Heroku. 28baf812ba55f09829b0489a24ec1518a7645db3 Ryan Tomayko rtomayko@gmail.com