Merged r14072 from trunk to 3.0-stable

unify .travis.run-test.sh to .travis.yml

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14073 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2015-03-13 10:25:59 +00:00
parent 795bbbec2f
commit 394954fb46
2 changed files with 1 additions and 4 deletions

View File

@@ -1,3 +0,0 @@
#! /bin/sh
JRUBY_OPTS=-J-Xmx1024m bundle exec rake test:${TEST_SUITE}

View File

@@ -35,6 +35,6 @@ script:
- "RUN_ON_NOT_OFFICIAL='' RUBY_VER=1.9 BRANCH=trunk bundle exec rake config/database.yml"
- "bundle install"
- "bundle exec rake ci:setup"
- "sh .travis.run-test.sh"
- JRUBY_OPTS=-J-Xmx1024m bundle exec rake test:${TEST_SUITE}
notifications:
email: false