Merged r14132 from trunk to 3.0-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/3.0-stable@14133 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/.travis.yml b/.travis.yml
index 013171bd0523333b738a2bc463780a720a85d5ce..822fa0b5f575285256dd61a0d78e7d8d5fffe3f5 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,18 +9,18 @@ rvm:
   - 2.2
   - jruby
 env:
-  - "TEST_SUITE=units       DATABASE_ADAPTER=postgresql"
-  - "TEST_SUITE=functionals DATABASE_ADAPTER=postgresql"
-  - "TEST_SUITE=integration DATABASE_ADAPTER=postgresql"
-  - "TEST_SUITE=ui          DATABASE_ADAPTER=postgresql"
-  - "TEST_SUITE=units       DATABASE_ADAPTER=mysql"
-  - "TEST_SUITE=functionals DATABASE_ADAPTER=mysql"
-  - "TEST_SUITE=integration DATABASE_ADAPTER=mysql"
-  - "TEST_SUITE=ui          DATABASE_ADAPTER=mysql"
-  - "TEST_SUITE=units       DATABASE_ADAPTER=sqlite3"
-  - "TEST_SUITE=functionals DATABASE_ADAPTER=sqlite3"
-  - "TEST_SUITE=integration DATABASE_ADAPTER=sqlite3"
-  - "TEST_SUITE=ui          DATABASE_ADAPTER=sqlite3"
+  - "SUITE=units       DATABASE_ADAPTER=postgresql"
+  - "SUITE=functionals DATABASE_ADAPTER=postgresql"
+  - "SUITE=integration DATABASE_ADAPTER=postgresql"
+  - "SUITE=ui          DATABASE_ADAPTER=postgresql"
+  - "SUITE=units       DATABASE_ADAPTER=mysql"
+  - "SUITE=functionals DATABASE_ADAPTER=mysql"
+  - "SUITE=integration DATABASE_ADAPTER=mysql"
+  - "SUITE=ui          DATABASE_ADAPTER=mysql"
+  - "SUITE=units       DATABASE_ADAPTER=sqlite3"
+  - "SUITE=functionals DATABASE_ADAPTER=sqlite3"
+  - "SUITE=integration DATABASE_ADAPTER=sqlite3"
+  - "SUITE=ui          DATABASE_ADAPTER=sqlite3"
 matrix:
   allow_failures:
     # SCM tests fail randomly due to IO.popen().
@@ -39,6 +39,6 @@ script:
   - "bundle install"
   - "bundle exec rake ci:setup"
   - phantomjs --webdriver 4444 &
-  - JRUBY_OPTS=-J-Xmx1024m bundle exec rake test:${TEST_SUITE}
+  - JRUBY_OPTS=-J-Xmx1024m bundle exec rake test:${SUITE}
 notifications:
   email: false