##// END OF EJS Templates
Merged r14132 from trunk to 2.6-stable...
Toshi MARUYAMA -
r13752:9472035a5189
parent child
Show More
@@ -10,15 +10,15 rvm:
10 - 2.1
10 - 2.1
11 - jruby
11 - jruby
12 env:
12 env:
13 - "TEST_SUITE=units DATABASE_ADAPTER=postgresql"
13 - "SUITE=units DATABASE_ADAPTER=postgresql"
14 - "TEST_SUITE=functionals DATABASE_ADAPTER=postgresql"
14 - "SUITE=functionals DATABASE_ADAPTER=postgresql"
15 - "TEST_SUITE=integration DATABASE_ADAPTER=postgresql"
15 - "SUITE=integration DATABASE_ADAPTER=postgresql"
16 - "TEST_SUITE=units DATABASE_ADAPTER=mysql"
16 - "SUITE=units DATABASE_ADAPTER=mysql"
17 - "TEST_SUITE=functionals DATABASE_ADAPTER=mysql"
17 - "SUITE=functionals DATABASE_ADAPTER=mysql"
18 - "TEST_SUITE=integration DATABASE_ADAPTER=mysql"
18 - "SUITE=integration DATABASE_ADAPTER=mysql"
19 - "TEST_SUITE=units DATABASE_ADAPTER=sqlite3"
19 - "SUITE=units DATABASE_ADAPTER=sqlite3"
20 - "TEST_SUITE=functionals DATABASE_ADAPTER=sqlite3"
20 - "SUITE=functionals DATABASE_ADAPTER=sqlite3"
21 - "TEST_SUITE=integration DATABASE_ADAPTER=sqlite3"
21 - "SUITE=integration DATABASE_ADAPTER=sqlite3"
22 matrix:
22 matrix:
23 allow_failures:
23 allow_failures:
24 # SCM tests fail randomly due to IO.popen().
24 # SCM tests fail randomly due to IO.popen().
@@ -35,6 +35,7 script:
35 - "bundle install"
35 - "bundle install"
36 - "RUN_ON_NOT_OFFICIAL='' RUBY_VER=1.9 BRANCH=trunk bundle exec rake config/database.yml"
36 - "RUN_ON_NOT_OFFICIAL='' RUBY_VER=1.9 BRANCH=trunk bundle exec rake config/database.yml"
37 - "bundle install"
37 - "bundle install"
38 - export TEST_SUITE=${SUITE}
38 - "JRUBY_OPTS=-J-Xmx1024m bundle exec rake ci"
39 - "JRUBY_OPTS=-J-Xmx1024m bundle exec rake ci"
39 notifications:
40 notifications:
40 email: false
41 email: false
General Comments 0
You need to be logged in to leave comments. Login now