summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2015-03-13 10:25:59 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2015-03-13 10:25:59 +0000
commit394954fb4676e18fd9ac51802e6d81fd3ffe2788 (patch)
treeac8c38171900ae4ba0db7f57e2e64e4c975e2087 /.travis.yml
parent795bbbec2f2d049c7e0aef7d79326ef44fbdedf9 (diff)
downloadredmine-394954fb4676e18fd9ac51802e6d81fd3ffe2788.tar.gz
redmine-394954fb4676e18fd9ac51802e6d81fd3ffe2788.zip
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
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index ca5c0d043..886239008 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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