summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-10-28 01:52:01 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-10-28 01:52:01 +0000
commit49f2d4729d1726e83483f97672bb80d69cbcf6af (patch)
tree6b5939e2b41d44ac4a92d0a70c5877994f7a4726
parentd8408375637553a6a931aa4bc876ac04e6ca09b7 (diff)
downloadredmine-49f2d4729d1726e83483f97672bb80d69cbcf6af.tar.gz
redmine-49f2d4729d1726e83483f97672bb80d69cbcf6af.zip
prevent rake task error on JRuby 1.7 (#12228)
Following is "rake db:migrate RAILS_ENV=test" output on jruby 1.7.0 (1.9.3p203) 2012-10-22 ff1ebbe on OpenJDK Client VM 1.6.0_18-b18 [linux-i386]. <pre> ArgumentError: file not found: db:migrate non_options at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:167 map! at org/jruby/RubyArray.java:2387 non_options at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:146 non_options at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:207 process_args at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:52 _run at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/minitest/unit.rb:891 run at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/minitest/unit.rb:884 run at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:21 autorun at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:326 run_once at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:27 autorun at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:325 </pre> git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10737 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--Gemfile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 33a29951d..f0ec5262d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -74,8 +74,9 @@ end
group :test do
gem "shoulda", "~> 2.11"
- # Shoulda does not work nice on Ruby 1.9.3 and seems to need test-unit explicitely.
- gem "test-unit", :platforms => [:mri_19]
+ # Shoulda does not work nice on Ruby 1.9.3 and JRuby 1.7.
+ # It seems to need test-unit explicitely.
+ gem "test-unit", :platforms => [:mri_19, :jruby]
gem "mocha", "0.12.3"
end