From 394954fb4676e18fd9ac51802e6d81fd3ffe2788 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Fri, 13 Mar 2015 10:25:59 +0000
Subject: [PATCH] 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
---
 .travis.run-test.sh | 3 ---
 .travis.yml         | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100644 .travis.run-test.sh

diff --git a/.travis.run-test.sh b/.travis.run-test.sh
deleted file mode 100644
index 29ba32120..000000000
--- 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 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
-- 
2.39.5