From 9472035a51899e4647e4b7f6bda6ceebec6ac2d8 2015-03-19 06:12:18
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: 2015-03-19 06:12:18
Subject: [PATCH] Merged r14132 from trunk to 2.6-stable

.travis.yml: replace TEST_SUITE to SUITE

Prevent travis UI confusion.
https://github.com/travis-ci/travis-ci/issues/3386

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14134 e93f8b46-1217-0410-a6f0-8f06a7374b81

---

diff --git a/.travis.yml b/.travis.yml
index 253825a..24996d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,15 +10,15 @@ rvm:
   - 2.1
   - jruby
 env:
-  - "TEST_SUITE=units       DATABASE_ADAPTER=postgresql"
-  - "TEST_SUITE=functionals DATABASE_ADAPTER=postgresql"
-  - "TEST_SUITE=integration DATABASE_ADAPTER=postgresql"
-  - "TEST_SUITE=units       DATABASE_ADAPTER=mysql"
-  - "TEST_SUITE=functionals DATABASE_ADAPTER=mysql"
-  - "TEST_SUITE=integration DATABASE_ADAPTER=mysql"
-  - "TEST_SUITE=units       DATABASE_ADAPTER=sqlite3"
-  - "TEST_SUITE=functionals DATABASE_ADAPTER=sqlite3"
-  - "TEST_SUITE=integration DATABASE_ADAPTER=sqlite3"
+  - "SUITE=units       DATABASE_ADAPTER=postgresql"
+  - "SUITE=functionals DATABASE_ADAPTER=postgresql"
+  - "SUITE=integration DATABASE_ADAPTER=postgresql"
+  - "SUITE=units       DATABASE_ADAPTER=mysql"
+  - "SUITE=functionals DATABASE_ADAPTER=mysql"
+  - "SUITE=integration DATABASE_ADAPTER=mysql"
+  - "SUITE=units       DATABASE_ADAPTER=sqlite3"
+  - "SUITE=functionals DATABASE_ADAPTER=sqlite3"
+  - "SUITE=integration DATABASE_ADAPTER=sqlite3"
 matrix:
   allow_failures:
     # SCM tests fail randomly due to IO.popen().
@@ -35,6 +35,7 @@ script:
   - "bundle install"
   - "RUN_ON_NOT_OFFICIAL='' RUBY_VER=1.9 BRANCH=trunk bundle exec rake config/database.yml"
   - "bundle install"
+  - export TEST_SUITE=${SUITE}
   - "JRUBY_OPTS=-J-Xmx1024m bundle exec rake ci"
 notifications:
   email: false