aboutsummaryrefslogtreecommitdiff
path: root/travis.sh
diff options
context:
space:
mode:
authorDan O'Reilly <oreilldf@gmail.com>2015-08-20 18:19:56 -0400
committerDan O'Reilly <oreilldf@gmail.com>2015-08-20 18:19:56 -0400
commit5de2a81b017273c9d91d6a54fc138cf077763730 (patch)
treef09a66570fa9bf724b6eb6b1f1481bc788c19b0a /travis.sh
parentafa488c4d10a06730d7a16a8eda4935a06ea965d (diff)
downloadprotobuf-5de2a81b017273c9d91d6a54fc138cf077763730.tar.gz
protobuf-5de2a81b017273c9d91d6a54fc138cf077763730.tar.bz2
protobuf-5de2a81b017273c9d91d6a54fc138cf077763730.zip
Improve tox.ini, install py26 for travis.
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
Diffstat (limited to 'travis.sh')
-rwxr-xr-xtravis.sh19
1 files changed, 14 insertions, 5 deletions
diff --git a/travis.sh b/travis.sh
index b53b9606..e76d83b3 100755
--- a/travis.sh
+++ b/travis.sh
@@ -111,21 +111,30 @@ build_javanano_oracle7() {
build_javanano
}
+internal_install_python_deps() {
+ sudo pip install tox
+ sudo apt-get install -y python-software-properties # for apt-add-repository
+ sudo apt-add-repository -y ppa:fkrull/deadsnakes
+ sudo apt-get update -qq
+ sudo apt-get install -y python2.6 python2.6-dev
+}
+
+
build_python() {
internal_build_cpp
- sudo pip install tox
+ internal_install_python_deps
cd python
- tox
+ tox -e py26-python,py27-python
cd ..
}
build_python_cpp() {
internal_build_cpp
- sudo pip install tox
- export LD_LIBRARY_PATH=../src/.libs # for Linux
+ internal_install_python_deps
+ export LD_LIBRARY_PATH=../src/.libs # for Linux
export DYLD_LIBRARY_PATH=../src/.libs # for OS X
cd python
- tox -- --cpp_implementation
+ tox -e py26-cpp,py27-cpp
cd ..
}