@@ -90,32 +90,43 @@ desc "Run everything against multiruby" task :multiruby do result = system "multiruby -S rake spec" raise "Multiruby tests failed" unless result + result = system "jruby -S rake spec" + raise "JRuby tests failed" unless result Dir.chdir "spec/integration/rails" do result = system "multiruby -S rake test_unit:rails" raise "Rails integration tests failed" unless result + + result = system "jruby -S rake test_unit:rails" + raise "Rails integration tests failed" unless result end Dir.chdir "spec/integration/merb" do result = system "multiruby -S rake spec" raise "Merb integration tests failed" unless result + + result = system "jruby -S rake spec" + raise "Rails integration tests failed" unless result end Dir.chdir "spec/integration/sinatra" do result = system "multiruby -S rake test" raise "Sinatra integration tests failed" unless result + + result = system "jruby -S rake test" + raise "Sinatra integration tests failed" unless result end Dir.chdir "spec/integration/rack" do result = system "multiruby -S rake test" raise "Rack integration tests failed" unless result + + result = system "jruby -S rake test" + raise "Rack integration tests failed" unless result end -end -desc "Run specs using jruby" -task "spec:jruby" do - result = system "jruby -S rake spec" - raise "JRuby tests failed" unless result + puts + puts "Multiruby OK!" end desc "Run each spec in isolation to test for dependency issues" @@ -183,8 +194,6 @@ end task :default => :spec -task :precommit => ["spec", "spec:jruby", "spec:integration"] - desc 'Removes trailing whitespace' task :whitespace do sh %{find . -name '*.rb' -exec sed -i '' 's/ *$//g' {} \\;} Rakefile 953d35b65a412e17cdef2122da329c1adff966b7 Bryan Helmkamp bryan@brynary.com http://github.com/brynary/webrat/commit/b4ae28c48cebdbdbd09aef6a1a3dd0e4821a827e b4ae28c48cebdbdbd09aef6a1a3dd0e4821a827e 2009-06-14T21:46:56-07:00 2009-06-14T21:46:56-07:00 Add JRuby to "rake multiruby" f29772849333d9ab74898d508361ba0e27c689e8 Bryan Helmkamp bryan@brynary.com