##// END OF EJS Templates
Merged r14172 from trunk to 2.6-stable...
Toshi MARUYAMA -
r13792:409c6755636b
parent child
Show More
@@ -10,15 +10,15 rvm:
10 - 2.1
10 - 2.1
11 - jruby
11 - jruby
12 env:
12 env:
13 - "SUITE=units DATABASE_ADAPTER=postgresql"
13 - "SUITE=units DB=postgresql"
14 - "SUITE=functionals DATABASE_ADAPTER=postgresql"
14 - "SUITE=functionals DB=postgresql"
15 - "SUITE=integration DATABASE_ADAPTER=postgresql"
15 - "SUITE=integration DB=postgresql"
16 - "SUITE=units DATABASE_ADAPTER=mysql"
16 - "SUITE=units DB=mysql"
17 - "SUITE=functionals DATABASE_ADAPTER=mysql"
17 - "SUITE=functionals DB=mysql"
18 - "SUITE=integration DATABASE_ADAPTER=mysql"
18 - "SUITE=integration DB=mysql"
19 - "SUITE=units DATABASE_ADAPTER=sqlite3"
19 - "SUITE=units DB=sqlite3"
20 - "SUITE=functionals DATABASE_ADAPTER=sqlite3"
20 - "SUITE=functionals DB=sqlite3"
21 - "SUITE=integration DATABASE_ADAPTER=sqlite3"
21 - "SUITE=integration DB=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().
@@ -29,6 +29,7 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"
31 script:
31 script:
32 - export DATABASE_ADAPTER=${DB}
32 - "SCMS=bazaar,cvs,subversion,git,mercurial,filesystem"
33 - "SCMS=bazaar,cvs,subversion,git,mercurial,filesystem"
33 - "export SCMS"
34 - "export SCMS"
34 - "git --version"
35 - "git --version"
General Comments 0
You need to be logged in to leave comments. Login now