##// END OF EJS Templates
Merged r14076 from trunk to 2.6-stable...
Toshi MARUYAMA -
r13748:53a411986faa
parent child
Show More
@@ -9,12 +9,6 rvm:
9 - 2.0
9 - 2.0
10 - 2.1
10 - 2.1
11 - jruby
11 - jruby
12 matrix:
13 allow_failures:
14 # SCM tests fail randomly due to IO.popen().
15 # http://www.redmine.org/issues/19091
16 # https://github.com/jruby/jruby/issues/779
17 - rvm: jruby
18 env:
12 env:
19 - "TEST_SUITE=units DATABASE_ADAPTER=postgresql"
13 - "TEST_SUITE=units DATABASE_ADAPTER=postgresql"
20 - "TEST_SUITE=functionals DATABASE_ADAPTER=postgresql"
14 - "TEST_SUITE=functionals DATABASE_ADAPTER=postgresql"
@@ -25,6 +19,12 env:
25 - "TEST_SUITE=units DATABASE_ADAPTER=sqlite3"
19 - "TEST_SUITE=units DATABASE_ADAPTER=sqlite3"
26 - "TEST_SUITE=functionals DATABASE_ADAPTER=sqlite3"
20 - "TEST_SUITE=functionals DATABASE_ADAPTER=sqlite3"
27 - "TEST_SUITE=integration DATABASE_ADAPTER=sqlite3"
21 - "TEST_SUITE=integration DATABASE_ADAPTER=sqlite3"
22 matrix:
23 allow_failures:
24 # SCM tests fail randomly due to IO.popen().
25 # http://www.redmine.org/issues/19091
26 # https://github.com/jruby/jruby/issues/779
27 - rvm: jruby
28 before_install:
28 before_install:
29 - "sudo apt-get update -qq"
29 - "sudo apt-get update -qq"
30 - "sudo apt-get --no-install-recommends install bzr cvs git mercurial subversion"
30 - "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