aboutsummaryrefslogtreecommitdiff
path: root/travis.sh
diff options
context:
space:
mode:
authorDan O'Reilly <oreilldf@gmail.com>2015-08-21 18:51:47 -0400
committerDan O'Reilly <oreilldf@gmail.com>2015-08-21 18:51:56 -0400
commit76f8a3fbcd2dde75d58fe242f70a235f29c806f5 (patch)
tree021fbc977a5fed7ed64751c89fa99bb84249271a /travis.sh
parent3791c8051a587de347c3aa1c03de79dce38c1a2e (diff)
downloadprotobuf-76f8a3fbcd2dde75d58fe242f70a235f29c806f5.tar.gz
protobuf-76f8a3fbcd2dde75d58fe242f70a235f29c806f5.tar.bz2
protobuf-76f8a3fbcd2dde75d58fe242f70a235f29c806f5.zip
Travis now only tests Python2.6 on Linux.
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
Diffstat (limited to 'travis.sh')
-rwxr-xr-xtravis.sh27
1 files changed, 21 insertions, 6 deletions
diff --git a/travis.sh b/travis.sh
index e76d83b3..a5208fe3 100755
--- a/travis.sh
+++ b/travis.sh
@@ -113,10 +113,13 @@ build_javanano_oracle7() {
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
+ # Only install Python2.6 on Linux.
+ if [ $(uname -s) == "Linux" ]; then
+ 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
+ fi
}
@@ -124,7 +127,13 @@ build_python() {
internal_build_cpp
internal_install_python_deps
cd python
- tox -e py26-python,py27-python
+ # Only test Python 2.6 on Linux
+ if [ $(uname -s) == "Linux" ]; then
+ envlist=py26-python,py27-python
+ else
+ envlist=py27-python
+ fi
+ tox -e $envlist
cd ..
}
@@ -134,7 +143,13 @@ build_python_cpp() {
export LD_LIBRARY_PATH=../src/.libs # for Linux
export DYLD_LIBRARY_PATH=../src/.libs # for OS X
cd python
- tox -e py26-cpp,py27-cpp
+ # Only test Python 2.6 on Linux
+ if [ $(uname -s) == "Linux" ]; then
+ envlist=py26-cpp,py27-cpp
+ else
+ envlist=py27-cpp
+ fi
+ tox -e $envlist
cd ..
}