##// END OF EJS Templates
Merged r14132 from trunk to 3.0-stable...
Toshi MARUYAMA -
r13751:33aaa06fe94e
parent child
Show More
@@ -9,18 +9,18 rvm:
9 - 2.2
9 - 2.2
10 - jruby
10 - jruby
11 env:
11 env:
12 - "TEST_SUITE=units DATABASE_ADAPTER=postgresql"
12 - "SUITE=units DATABASE_ADAPTER=postgresql"
13 - "TEST_SUITE=functionals DATABASE_ADAPTER=postgresql"
13 - "SUITE=functionals DATABASE_ADAPTER=postgresql"
14 - "TEST_SUITE=integration DATABASE_ADAPTER=postgresql"
14 - "SUITE=integration DATABASE_ADAPTER=postgresql"
15 - "TEST_SUITE=ui DATABASE_ADAPTER=postgresql"
15 - "SUITE=ui 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=ui DATABASE_ADAPTER=mysql"
19 - "SUITE=ui DATABASE_ADAPTER=mysql"
20 - "TEST_SUITE=units DATABASE_ADAPTER=sqlite3"
20 - "SUITE=units DATABASE_ADAPTER=sqlite3"
21 - "TEST_SUITE=functionals DATABASE_ADAPTER=sqlite3"
21 - "SUITE=functionals DATABASE_ADAPTER=sqlite3"
22 - "TEST_SUITE=integration DATABASE_ADAPTER=sqlite3"
22 - "SUITE=integration DATABASE_ADAPTER=sqlite3"
23 - "TEST_SUITE=ui DATABASE_ADAPTER=sqlite3"
23 - "SUITE=ui DATABASE_ADAPTER=sqlite3"
24 matrix:
24 matrix:
25 allow_failures:
25 allow_failures:
26 # SCM tests fail randomly due to IO.popen().
26 # SCM tests fail randomly due to IO.popen().
@@ -39,6 +39,6 script:
39 - "bundle install"
39 - "bundle install"
40 - "bundle exec rake ci:setup"
40 - "bundle exec rake ci:setup"
41 - phantomjs --webdriver 4444 &
41 - phantomjs --webdriver 4444 &
42 - JRUBY_OPTS=-J-Xmx1024m bundle exec rake test:${TEST_SUITE}
42 - JRUBY_OPTS=-J-Xmx1024m bundle exec rake test:${SUITE}
43 notifications:
43 notifications:
44 email: false
44 email: false
General Comments 0
You need to be logged in to leave comments. Login now