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

diff --git a/.travis.run-test.sh b/.travis.run-test.sh
deleted file mode 100644 (file)
index 29ba321..0000000
--- a/.travis.run-test.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-JRUBY_OPTS=-J-Xmx1024m bundle exec rake test:${TEST_SUITE}

diff --git a/.travis.yml b/.travis.yml
index ca5c0d043436cb5187c8cd72c4040bec0293c2fe..88623900803588b662ce288ce52e9a86182600cc 100644 (file)
--- 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