##// END OF EJS Templates
Merged r14074 from trunk to 3.0-stable...
Toshi MARUYAMA -
r13693:fae1ce430c04
parent child
Show More
@@ -18,12 +18,15 env:
18 - "TEST_SUITE=units DATABASE_ADAPTER=postgresql"
18 - "TEST_SUITE=units DATABASE_ADAPTER=postgresql"
19 - "TEST_SUITE=functionals DATABASE_ADAPTER=postgresql"
19 - "TEST_SUITE=functionals DATABASE_ADAPTER=postgresql"
20 - "TEST_SUITE=integration DATABASE_ADAPTER=postgresql"
20 - "TEST_SUITE=integration DATABASE_ADAPTER=postgresql"
21 - "TEST_SUITE=ui DATABASE_ADAPTER=postgresql"
21 - "TEST_SUITE=units DATABASE_ADAPTER=mysql"
22 - "TEST_SUITE=units DATABASE_ADAPTER=mysql"
22 - "TEST_SUITE=functionals DATABASE_ADAPTER=mysql"
23 - "TEST_SUITE=functionals DATABASE_ADAPTER=mysql"
23 - "TEST_SUITE=integration DATABASE_ADAPTER=mysql"
24 - "TEST_SUITE=integration DATABASE_ADAPTER=mysql"
25 - "TEST_SUITE=ui DATABASE_ADAPTER=mysql"
24 - "TEST_SUITE=units DATABASE_ADAPTER=sqlite3"
26 - "TEST_SUITE=units DATABASE_ADAPTER=sqlite3"
25 - "TEST_SUITE=functionals DATABASE_ADAPTER=sqlite3"
27 - "TEST_SUITE=functionals DATABASE_ADAPTER=sqlite3"
26 - "TEST_SUITE=integration DATABASE_ADAPTER=sqlite3"
28 - "TEST_SUITE=integration DATABASE_ADAPTER=sqlite3"
29 - "TEST_SUITE=ui DATABASE_ADAPTER=sqlite3"
27 before_install:
30 before_install:
28 - "sudo apt-get update -qq"
31 - "sudo apt-get update -qq"
29 - "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"
@@ -35,6 +38,7 script:
35 - "RUN_ON_NOT_OFFICIAL='' RUBY_VER=1.9 BRANCH=trunk bundle exec rake config/database.yml"
38 - "RUN_ON_NOT_OFFICIAL='' RUBY_VER=1.9 BRANCH=trunk bundle exec rake config/database.yml"
36 - "bundle install"
39 - "bundle install"
37 - "bundle exec rake ci:setup"
40 - "bundle exec rake ci:setup"
41 - phantomjs --webdriver 4444 &
38 - JRUBY_OPTS=-J-Xmx1024m bundle exec rake test:${TEST_SUITE}
42 - JRUBY_OPTS=-J-Xmx1024m bundle exec rake test:${TEST_SUITE}
39 notifications:
43 notifications:
40 email: false
44 email: false
General Comments 0
You need to be logged in to leave comments. Login now