Remove unused BACKEND. Don't run sqlite py test on py 2.6

master
baztian 2015-04-01 21:03:14 +02:00
parent 10450cbe32
commit 5513c415a9
2 changed files with 8 additions and 17 deletions

View File

@ -9,22 +9,20 @@ python:
env: env:
matrix: matrix:
- BACKEND=unused TESTNAME=test_mock JDBC_DRIVER=org.jaydebeapi:mockdriver:1.0-SNAPSHOT - TESTNAME=test_mock JDBC_DRIVER=org.jaydebeapi:mockdriver:1.0-SNAPSHOT
- BACKEND=hsqldb TESTNAME=test_integration.HsqldbTest JDBC_DRIVER=org.hsqldb:hsqldb:1.8.0.10 - TESTNAME=test_integration.HsqldbTest JDBC_DRIVER=org.hsqldb:hsqldb:1.8.0.10
- BACKEND=sqlitejdbc TESTNAME=test_integration.SqliteXerialTest JDBC_DRIVER=org.xerial:sqlite-jdbc:3.7.2 - TESTNAME=test_integration.SqliteXerialTest JDBC_DRIVER=org.xerial:sqlite-jdbc:3.7.2
- BACKEND=sqlitepy TESTNAME=test_integration.SqlitePyTest
matrix: matrix:
# exclude:
# - python: 2.7
# env: BACKEND=sqlitejdbc
include: include:
- python: 2.7 - python: 2.7
env: JYTHON=org.python:jython-installer:2.5.3 BACKEND=hsqldb TESTNAME=test_integration.HsqldbTest JDBC_DRIVER=org.hsqldb:hsqldb:1.8.0.10 env: TESTNAME=test_integration.SqlitePyTest
- python: 2.7 - python: 2.7
env: JYTHON=org.python:jython-installer:2.7-rc1 BACKEND=hsqldb TESTNAME=test_integration.HsqldbTest JDBC_DRIVER=org.hsqldb:hsqldb:1.8.0.10 env: JYTHON=org.python:jython-installer:2.5.3 TESTNAME=test_integration.HsqldbTest JDBC_DRIVER=org.hsqldb:hsqldb:1.8.0.10
- python: 2.7 - python: 2.7
env: JYTHON=org.python:jython-installer:2.7-rc1 BACKEND=unused TESTNAME=test_mock JDBC_DRIVER=org.jaydebeapi:mockdriver:1.0-SNAPSHOT env: JYTHON=org.python:jython-installer:2.7-rc1 TESTNAME=test_integration.HsqldbTest JDBC_DRIVER=org.hsqldb:hsqldb:1.8.0.10
- python: 2.7
env: JYTHON=org.python:jython-installer:2.7-rc1 TESTNAME=test_mock JDBC_DRIVER=org.jaydebeapi:mockdriver:1.0-SNAPSHOT
before_install: before_install:
- ci/before_install.sh - ci/before_install.sh

View File

@ -1,7 +0,0 @@
#!/bin/sh
set -e
pip install jip==0.7
install="${TRAVIS_BUILD_DIR}/ci/install_${BACKEND}.sh"
[ -x ${install} ] && ${install} || echo "nothing to run"