##// END OF EJS Templates
Merged r14076 from trunk to 3.0-stable...
Toshi MARUYAMA -
r13749:92b7b831cb4b
parent child
Show More
@@ -8,12 +8,6 rvm:
8 - 2.1
8 - 2.1
9 - 2.2
9 - 2.2
10 - jruby
10 - jruby
11 matrix:
12 allow_failures:
13 # SCM tests fail randomly due to IO.popen().
14 # http://www.redmine.org/issues/19091
15 # https://github.com/jruby/jruby/issues/779
16 - rvm: jruby
17 env:
11 env:
18 - "TEST_SUITE=units DATABASE_ADAPTER=postgresql"
12 - "TEST_SUITE=units DATABASE_ADAPTER=postgresql"
19 - "TEST_SUITE=functionals DATABASE_ADAPTER=postgresql"
13 - "TEST_SUITE=functionals DATABASE_ADAPTER=postgresql"
@@ -27,6 +21,12 env:
27 - "TEST_SUITE=functionals DATABASE_ADAPTER=sqlite3"
21 - "TEST_SUITE=functionals DATABASE_ADAPTER=sqlite3"
28 - "TEST_SUITE=integration DATABASE_ADAPTER=sqlite3"
22 - "TEST_SUITE=integration DATABASE_ADAPTER=sqlite3"
29 - "TEST_SUITE=ui DATABASE_ADAPTER=sqlite3"
23 - "TEST_SUITE=ui DATABASE_ADAPTER=sqlite3"
24 matrix:
25 allow_failures:
26 # SCM tests fail randomly due to IO.popen().
27 # http://www.redmine.org/issues/19091
28 # https://github.com/jruby/jruby/issues/779
29 - rvm: jruby
30 before_install:
30 before_install:
31 - "sudo apt-get update -qq"
31 - "sudo apt-get update -qq"
32 - "sudo apt-get --no-install-recommends install bzr cvs git mercurial subversion"
32 - "sudo apt-get --no-install-recommends install bzr cvs git mercurial subversion"
General Comments 0
You need to be logged in to leave comments. Login now